diff --git a/content/http..www.gap-system.org/$Types.omdoc b/content/http..www.gap-system.org/$Types.omdoc
index 341494a15958aa57385e96b85cb9c9325b190f08..ae963a6f9408d6ef74431ecc20ac3e23b7ece06a 100644
--- a/content/http..www.gap-system.org/$Types.omdoc
+++ b/content/http..www.gap-system.org/$Types.omdoc
@@ -1,55 +1,70 @@
-<omdoc xmlns="http://omdoc.org/ns" xmlns:om="http://www.openmath.org/OpenMath"><theory name="Types" base="http://www.gap-system.org/" meta="http://cds.omdoc.org/urtheories?PLF"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#85.3.0:1155.40.1"/></metadata><constant name="object">
-       <metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#111.4.1:126.4.16"/></metadata>
+<omdoc xmlns="http://omdoc.org/ns" xmlns:om="http://www.openmath.org/OpenMath"><theory name="Types" base="http://www.gap-system.org" meta="http://cds.omdoc.org/urtheories?PLF"><metadata><meta property="http://gl.mathhub.info/MMT/LFX/TypedHierarchy?Symbols?TypeLevel"><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://cds.omdoc.org/urtheories" module="Kinded" name="kind"></om:OMS></om:OMOBJ></meta><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#85.3.0:1178.41.0"/></metadata><constant name="object">
+       <metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#111.4.1:125.4.15"/><meta property="http://gl.mathhub.info/MMT/LFX/TypedHierarchy?Symbols?TypeLevel"><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://cds.omdoc.org/urtheories" module="Kinded" name="kind"></om:OMS></om:OMOBJ></meta></metadata>
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://cds.omdoc.org/urtheories" module="Typed" name="type"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#120.4.10:123.4.13"/></metadata></om:OMS></om:OMOBJ></type>
        
        
      </constant><constant name="category">
-       <metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#128.5.1:145.5.18"/></metadata>
+       <metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#128.5.1:144.5.17"/><meta property="http://gl.mathhub.info/MMT/LFX/TypedHierarchy?Symbols?TypeLevel"><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://cds.omdoc.org/urtheories" module="Kinded" name="kind"></om:OMS></om:OMOBJ></meta></metadata>
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://cds.omdoc.org/urtheories" module="Typed" name="type"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#139.5.12:142.5.15"/></metadata></om:OMS></om:OMOBJ></type>
        
        
+     </constant><constant name="booleans">
+       <metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#149.7.1:165.7.17"/><meta property="http://gl.mathhub.info/MMT/LFX/TypedHierarchy?Symbols?TypeLevel"><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://cds.omdoc.org/urtheories" module="Kinded" name="kind"></om:OMS></om:OMOBJ></meta></metadata>
+       <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://cds.omdoc.org/urtheories" module="Typed" name="type"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#160.7.12:163.7.15"/></metadata></om:OMS></om:OMOBJ></type>
+       
+       
+     </constant><constant name="integers">
+       <metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#168.8.1:184.8.17"/><meta property="http://gl.mathhub.info/MMT/LFX/TypedHierarchy?Symbols?TypeLevel"><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://cds.omdoc.org/urtheories" module="Kinded" name="kind"></om:OMS></om:OMOBJ></meta></metadata>
+       <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://cds.omdoc.org/urtheories" module="Typed" name="type"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#179.8.12:182.8.15"/></metadata></om:OMS></om:OMOBJ></type>
+       
+       
+     </constant><constant name="floats">
+       <metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#187.9.1:201.9.15"/><meta property="http://gl.mathhub.info/MMT/LFX/TypedHierarchy?Symbols?TypeLevel"><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://cds.omdoc.org/urtheories" module="Kinded" name="kind"></om:OMS></om:OMOBJ></meta></metadata>
+       <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://cds.omdoc.org/urtheories" module="Typed" name="type"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#196.9.10:199.9.13"/></metadata></om:OMS></om:OMOBJ></type>
+       
+       
      </constant><constant name="filter">
-       <metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#149.7.1:173.7.25"/></metadata>
+       <metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#206.11.1:229.11.24"/></metadata>
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://cds.omdoc.org/urtheories" module="Kinded" name="kind"></om:OMS></om:OMOBJ></type>
-       <definition><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#937.33.27:942.33.32"/></metadata>
+       <definition><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#215.11.10:227.11.22"/></metadata>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="object"></om:OMS><om:OMS base="http://cds.omdoc.org/urtheories" module="Typed" name="type"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#167.7.19:170.7.22"/></metadata></om:OMS>
+              <om:OMS base="http://www.gap-system.org" module="Types" name="object"></om:OMS><om:OMS base="http://cds.omdoc.org/urtheories" module="Typed" name="type"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#224.11.19:227.11.22"/></metadata></om:OMS>
       </om:OMA></om:OMOBJ></definition>
        
-     </constant><constant name="%23">
-       <metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#177.9.1:243.9.67"/></metadata>
-       <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#190.9.14:211.9.35"/></metadata>
+     </constant><constant name="hastp">
+       <metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#234.13.1:294.13.61"/><meta property="http://gl.mathhub.info/MMT/LFX/TypedHierarchy?Symbols?TypeLevel"><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://cds.omdoc.org/urtheories" module="Kinded" name="kind"></om:OMS></om:OMOBJ></meta></metadata>
+       <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#242.13.9:263.13.30"/></metadata>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="object"></om:OMS><om:OMS base="http://www.gap-system.org/" module="Types" name="filter"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#199.9.23:204.9.28"/></metadata></om:OMS><om:OMS base="http://cds.omdoc.org/urtheories" module="Typed" name="type"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#208.9.32:211.9.35"/></metadata></om:OMS>
+              <om:OMS base="http://www.gap-system.org" module="Types" name="object"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#242.13.9:247.13.14"/></metadata></om:OMS><om:OMS base="http://www.gap-system.org" module="Types" name="filter"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#251.13.18:256.13.23"/></metadata></om:OMS><om:OMS base="http://cds.omdoc.org/urtheories" module="Typed" name="type"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#260.13.27:263.13.30"/></metadata></om:OMS>
       </om:OMA></om:OMOBJ></type>
        
-       <notations><notation dimension="1" precedence="0" fixity="mixfix" arguments="1 # 2"> <scope languages="" priority="0"/> </notation></notations>
+       <notations><notation dimension="1" precedence="0" fixity="mixfix" arguments="1 $ 2"> <scope languages="" priority="0"/> </notation></notations>
      </constant><constant name="filter_and">
-       <metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#247.11.1:298.11.52"/></metadata>
-       <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#260.11.14:283.11.37"/></metadata>
+       <metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#299.15.1:349.15.51"/><meta property="http://gl.mathhub.info/MMT/LFX/TypedHierarchy?Symbols?TypeLevel"><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://cds.omdoc.org/urtheories" module="Kinded" name="kind"></om:OMS></om:OMOBJ></meta></metadata>
+       <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#312.15.14:335.15.37"/></metadata>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="filter"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#260.11.14:265.11.19"/></metadata></om:OMS><om:OMS base="http://www.gap-system.org/" module="Types" name="filter"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#269.11.23:274.11.28"/></metadata></om:OMS><om:OMS base="http://www.gap-system.org/" module="Types" name="filter"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#278.11.32:283.11.37"/></metadata></om:OMS>
+              <om:OMS base="http://www.gap-system.org" module="Types" name="filter"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#312.15.14:317.15.19"/></metadata></om:OMS><om:OMS base="http://www.gap-system.org" module="Types" name="filter"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#321.15.23:326.15.28"/></metadata></om:OMS><om:OMS base="http://www.gap-system.org" module="Types" name="filter"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#330.15.32:335.15.37"/></metadata></om:OMS>
       </om:OMA></om:OMOBJ></type>
        
        <notations><notation dimension="1" precedence="0" fixity="mixfix" arguments="1 and 2"> <scope languages="" priority="0"/> </notation></notations>
      </constant><constant name="filter_and_hasFilter1">
-       <metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#300.12.1:381.12.82"/></metadata>
-       <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMBIND><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#324.12.25:378.12.79"/></metadata>
+       <metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#352.16.1:441.16.90"/><meta property="http://gl.mathhub.info/MMT/LFX/TypedHierarchy?Symbols?TypeLevel"><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://cds.omdoc.org/urtheories" module="Typed" name="type"></om:OMS></om:OMOBJ></meta></metadata>
+       <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMBIND><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#376.16.25:439.16.88"/></metadata>
                  <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="Pi"></om:OMS>
-                 <om:OMBVAR><om:OMV name="x"><metadata><tag property="http://cds.omdoc.org/mmt?mmt?inferred-type"/><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#325.12.26:325.12.26"/></metadata><type><om:OMS base="http://www.gap-system.org/" module="Types" name="object"></om:OMS></type></om:OMV><om:OMV name="f"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#327.12.28:327.12.28"/></metadata><type><om:OMS base="http://www.gap-system.org/" module="Types" name="filter"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#331.12.32:336.12.37"/></metadata></om:OMS></type></om:OMV><om:OMV name="g"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#338.12.39:338.12.39"/></metadata><type><om:OMS base="http://www.gap-system.org/" module="Types" name="filter"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#342.12.43:347.12.48"/></metadata></om:OMS></type></om:OMV></om:OMBVAR>
-                 <om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#350.12.51:378.12.79"/></metadata>
+                 <om:OMBVAR><om:OMV name="x"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#377.16.26:377.16.26"/></metadata><type><om:OMS base="http://www.gap-system.org" module="Types" name="object"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#381.16.30:386.16.35"/></metadata></om:OMS></type></om:OMV><om:OMV name="f"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#388.16.37:388.16.37"/></metadata><type><om:OMS base="http://www.gap-system.org" module="Types" name="filter"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#392.16.41:397.16.46"/></metadata></om:OMS></type></om:OMV><om:OMV name="g"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#399.16.48:399.16.48"/></metadata><type><om:OMS base="http://www.gap-system.org" module="Types" name="filter"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#403.16.52:408.16.57"/></metadata></om:OMS></type></om:OMV></om:OMBVAR>
+                 <om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#411.16.60:439.16.88"/></metadata>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
-              <om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#350.12.51:354.12.55"/></metadata>
+              <om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#411.16.60:415.16.64"/></metadata>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#350.12.51:350.12.51"/></metadata></om:OMV><om:OMV name="f"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#354.12.55:354.12.55"/></metadata></om:OMV>
-      </om:OMA><om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#358.12.59:362.12.63"/></metadata>
+              <om:OMS base="http://www.gap-system.org" module="Types" name="hastp"></om:OMS><om:OMV name="x"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#411.16.60:411.16.60"/></metadata></om:OMV><om:OMV name="f"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#415.16.64:415.16.64"/></metadata></om:OMV>
+      </om:OMA><om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#419.16.68:423.16.72"/></metadata>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#358.12.59:358.12.59"/></metadata></om:OMV><om:OMV name="g"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#362.12.63:362.12.63"/></metadata></om:OMV>
-      </om:OMA><om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#366.12.67:378.12.79"/></metadata>
+              <om:OMS base="http://www.gap-system.org" module="Types" name="hastp"></om:OMS><om:OMV name="x"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#419.16.68:419.16.68"/></metadata></om:OMV><om:OMV name="g"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#423.16.72:423.16.72"/></metadata></om:OMV>
+      </om:OMA><om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#427.16.76:439.16.88"/></metadata>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#366.12.67:366.12.67"/></metadata></om:OMV><om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#370.12.71:378.12.79"/></metadata>
+              <om:OMS base="http://www.gap-system.org" module="Types" name="hastp"></om:OMS><om:OMV name="x"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#427.16.76:427.16.76"/></metadata></om:OMV><om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#431.16.80:439.16.88"/></metadata>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="filter_and"></om:OMS><om:OMV name="f"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#371.12.72:371.12.72"/></metadata></om:OMV><om:OMV name="g"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#377.12.78:377.12.78"/></metadata></om:OMV>
+              <om:OMS base="http://www.gap-system.org" module="Types" name="filter_and"></om:OMS><om:OMV name="f"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#432.16.81:432.16.81"/></metadata></om:OMV><om:OMV name="g"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#438.16.87:438.16.87"/></metadata></om:OMV>
       </om:OMA>
       </om:OMA>
       </om:OMA>
@@ -57,179 +72,164 @@
        
        
      </constant><constant name="filter_and_hasFilter2">
-       <metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#383.13.1:456.13.74"/></metadata>
-       <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMBIND><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#407.13.25:453.13.71"/></metadata>
+       <metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#444.17.1:525.17.82"/><meta property="http://gl.mathhub.info/MMT/LFX/TypedHierarchy?Symbols?TypeLevel"><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://cds.omdoc.org/urtheories" module="Typed" name="type"></om:OMS></om:OMOBJ></meta></metadata>
+       <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMBIND><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#468.17.25:523.17.80"/></metadata>
                  <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="Pi"></om:OMS>
-                 <om:OMBVAR><om:OMV name="x"><metadata><tag property="http://cds.omdoc.org/mmt?mmt?inferred-type"/><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#408.13.26:408.13.26"/></metadata><type><om:OMS base="http://www.gap-system.org/" module="Types" name="object"></om:OMS></type></om:OMV><om:OMV name="f"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#410.13.28:410.13.28"/></metadata><type><om:OMS base="http://www.gap-system.org/" module="Types" name="filter"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#414.13.32:419.13.37"/></metadata></om:OMS></type></om:OMV><om:OMV name="g"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#421.13.39:421.13.39"/></metadata><type><om:OMS base="http://www.gap-system.org/" module="Types" name="filter"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#425.13.43:430.13.48"/></metadata></om:OMS></type></om:OMV></om:OMBVAR>
-                 <om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#433.13.51:453.13.71"/></metadata>
+                 <om:OMBVAR><om:OMV name="x"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#469.17.26:469.17.26"/></metadata><type><om:OMS base="http://www.gap-system.org" module="Types" name="object"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#473.17.30:478.17.35"/></metadata></om:OMS></type></om:OMV><om:OMV name="f"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#480.17.37:480.17.37"/></metadata><type><om:OMS base="http://www.gap-system.org" module="Types" name="filter"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#484.17.41:489.17.46"/></metadata></om:OMS></type></om:OMV><om:OMV name="g"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#491.17.48:491.17.48"/></metadata><type><om:OMS base="http://www.gap-system.org" module="Types" name="filter"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#495.17.52:500.17.57"/></metadata></om:OMS></type></om:OMV></om:OMBVAR>
+                 <om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#503.17.60:523.17.80"/></metadata>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
-              <om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#433.13.51:445.13.63"/></metadata>
+              <om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#503.17.60:515.17.72"/></metadata>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#433.13.51:433.13.51"/></metadata></om:OMV><om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#437.13.55:445.13.63"/></metadata>
+              <om:OMS base="http://www.gap-system.org" module="Types" name="hastp"></om:OMS><om:OMV name="x"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#503.17.60:503.17.60"/></metadata></om:OMV><om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#507.17.64:515.17.72"/></metadata>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="filter_and"></om:OMS><om:OMV name="f"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#438.13.56:438.13.56"/></metadata></om:OMV><om:OMV name="g"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#444.13.62:444.13.62"/></metadata></om:OMV>
+              <om:OMS base="http://www.gap-system.org" module="Types" name="filter_and"></om:OMS><om:OMV name="f"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#508.17.65:508.17.65"/></metadata></om:OMV><om:OMV name="g"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#514.17.71:514.17.71"/></metadata></om:OMV>
       </om:OMA>
-      </om:OMA><om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#449.13.67:453.13.71"/></metadata>
+      </om:OMA><om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#519.17.76:523.17.80"/></metadata>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#449.13.67:449.13.67"/></metadata></om:OMV><om:OMV name="f"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#453.13.71:453.13.71"/></metadata></om:OMV>
+              <om:OMS base="http://www.gap-system.org" module="Types" name="hastp"></om:OMS><om:OMV name="x"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#519.17.76:519.17.76"/></metadata></om:OMV><om:OMV name="f"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#523.17.80:523.17.80"/></metadata></om:OMV>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
        
        
      </constant><constant name="filter_and_hasFilter3">
-       <metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#458.14.1:531.14.74"/></metadata>
-       <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMBIND><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#482.14.25:528.14.71"/></metadata>
+       <metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#528.18.1:609.18.82"/><meta property="http://gl.mathhub.info/MMT/LFX/TypedHierarchy?Symbols?TypeLevel"><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://cds.omdoc.org/urtheories" module="Typed" name="type"></om:OMS></om:OMOBJ></meta></metadata>
+       <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMBIND><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#552.18.25:607.18.80"/></metadata>
                  <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="Pi"></om:OMS>
-                 <om:OMBVAR><om:OMV name="x"><metadata><tag property="http://cds.omdoc.org/mmt?mmt?inferred-type"/><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#483.14.26:483.14.26"/></metadata><type><om:OMS base="http://www.gap-system.org/" module="Types" name="object"></om:OMS></type></om:OMV><om:OMV name="f"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#485.14.28:485.14.28"/></metadata><type><om:OMS base="http://www.gap-system.org/" module="Types" name="filter"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#489.14.32:494.14.37"/></metadata></om:OMS></type></om:OMV><om:OMV name="g"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#496.14.39:496.14.39"/></metadata><type><om:OMS base="http://www.gap-system.org/" module="Types" name="filter"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#500.14.43:505.14.48"/></metadata></om:OMS></type></om:OMV></om:OMBVAR>
-                 <om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#508.14.51:528.14.71"/></metadata>
+                 <om:OMBVAR><om:OMV name="x"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#553.18.26:553.18.26"/></metadata><type><om:OMS base="http://www.gap-system.org" module="Types" name="object"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#557.18.30:562.18.35"/></metadata></om:OMS></type></om:OMV><om:OMV name="f"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#564.18.37:564.18.37"/></metadata><type><om:OMS base="http://www.gap-system.org" module="Types" name="filter"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#568.18.41:573.18.46"/></metadata></om:OMS></type></om:OMV><om:OMV name="g"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#575.18.48:575.18.48"/></metadata><type><om:OMS base="http://www.gap-system.org" module="Types" name="filter"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#579.18.52:584.18.57"/></metadata></om:OMS></type></om:OMV></om:OMBVAR>
+                 <om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#587.18.60:607.18.80"/></metadata>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
-              <om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#508.14.51:520.14.63"/></metadata>
+              <om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#587.18.60:599.18.72"/></metadata>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#508.14.51:508.14.51"/></metadata></om:OMV><om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#512.14.55:520.14.63"/></metadata>
+              <om:OMS base="http://www.gap-system.org" module="Types" name="hastp"></om:OMS><om:OMV name="x"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#587.18.60:587.18.60"/></metadata></om:OMV><om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#591.18.64:599.18.72"/></metadata>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="filter_and"></om:OMS><om:OMV name="f"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#513.14.56:513.14.56"/></metadata></om:OMV><om:OMV name="g"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#519.14.62:519.14.62"/></metadata></om:OMV>
+              <om:OMS base="http://www.gap-system.org" module="Types" name="filter_and"></om:OMS><om:OMV name="f"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#592.18.65:592.18.65"/></metadata></om:OMV><om:OMV name="g"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#598.18.71:598.18.71"/></metadata></om:OMV>
       </om:OMA>
-      </om:OMA><om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#524.14.67:528.14.71"/></metadata>
+      </om:OMA><om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#603.18.76:607.18.80"/></metadata>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#524.14.67:524.14.67"/></metadata></om:OMV><om:OMV name="g"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#528.14.71:528.14.71"/></metadata></om:OMV>
+              <om:OMS base="http://www.gap-system.org" module="Types" name="hastp"></om:OMS><om:OMV name="x"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#603.18.76:603.18.76"/></metadata></om:OMV><om:OMV name="g"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#607.18.80:607.18.80"/></metadata></om:OMV>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
        
        
      </constant><constant name="ded">
-       <metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#535.16.1:556.16.22"/></metadata>
-       <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#541.16.7:553.16.19"/></metadata>
+       <metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#614.20.1:634.20.21"/><meta property="http://gl.mathhub.info/MMT/LFX/TypedHierarchy?Symbols?TypeLevel"><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://cds.omdoc.org/urtheories" module="Kinded" name="kind"></om:OMS></om:OMOBJ></meta></metadata>
+       <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#620.20.7:632.20.19"/></metadata>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="object"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#541.16.7:546.16.12"/></metadata></om:OMS><om:OMS base="http://cds.omdoc.org/urtheories" module="Typed" name="type"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#550.16.16:553.16.19"/></metadata></om:OMS>
+              <om:OMS base="http://www.gap-system.org" module="Types" name="object"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#620.20.7:625.20.12"/></metadata></om:OMS><om:OMS base="http://cds.omdoc.org/urtheories" module="Typed" name="type"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#629.20.16:632.20.19"/></metadata></om:OMS>
       </om:OMA></om:OMOBJ></type>
        
        
-     </constant><ruleconstant name="[scala://GAP.odk.mmt.kwarc.info?Booleans]"><type><om:OMS base="scala://GAP.odk.mmt.kwarc.info" module="Booleans"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#565.18.6:578.18.19"/></metadata></om:OMS></type></ruleconstant><ruleconstant name="[scala://GAP.odk.mmt.kwarc.info?Integers]"><type><om:OMS base="scala://GAP.odk.mmt.kwarc.info" module="Integers"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#588.19.6:601.19.19"/></metadata></om:OMS></type></ruleconstant><ruleconstant name="[scala://GAP.odk.mmt.kwarc.info?Floats]"><type><om:OMS base="scala://GAP.odk.mmt.kwarc.info" module="Floats"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#611.20.6:622.20.17"/></metadata></om:OMS></type></ruleconstant><constant name="booleans">
-       <metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#629.22.1:646.22.18"/></metadata>
-       <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://cds.omdoc.org/urtheories" module="Typed" name="type"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#640.22.12:643.22.15"/></metadata></om:OMS></om:OMOBJ></type>
-       
-       
-     </constant><constant name="integers">
-       <metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#648.23.1:665.23.18"/></metadata>
-       <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://cds.omdoc.org/urtheories" module="Typed" name="type"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#659.23.12:662.23.15"/></metadata></om:OMS></om:OMOBJ></type>
-       
-       
-     </constant><constant name="floats">
-       <metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#667.24.1:682.24.16"/></metadata>
-       <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://cds.omdoc.org/urtheories" module="Typed" name="type"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#676.24.10:679.24.13"/></metadata></om:OMS></om:OMOBJ></type>
-       
-       
-     </constant><constant name="gapbool">
-       <metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#684.25.1:713.25.30"/></metadata>
-       <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#694.25.11:710.25.27"/></metadata>
+     </constant><ruleconstant name="[scala://GAP.odk.mmt.kwarc.info?Booleans]"><type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="scala://GAP.odk.mmt.kwarc.info" module="Booleans"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#644.22.6:657.22.19"/></metadata></om:OMS></om:OMOBJ></type></ruleconstant><ruleconstant name="[scala://GAP.odk.mmt.kwarc.info?Integers]"><type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="scala://GAP.odk.mmt.kwarc.info" module="Integers"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#667.23.6:680.23.19"/></metadata></om:OMS></om:OMOBJ></type></ruleconstant><ruleconstant name="[scala://GAP.odk.mmt.kwarc.info?Floats]"><type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="scala://GAP.odk.mmt.kwarc.info" module="Floats"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#690.24.6:701.24.17"/></metadata></om:OMS></om:OMOBJ></type></ruleconstant><constant name="gapbool">
+       <metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#708.26.1:736.26.29"/><meta property="http://gl.mathhub.info/MMT/LFX/TypedHierarchy?Symbols?TypeLevel"><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://cds.omdoc.org/urtheories" module="Typed" name="type"></om:OMS></om:OMOBJ></meta></metadata>
+       <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#718.26.11:734.26.27"/></metadata>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="booleans"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#694.25.11:701.25.18"/></metadata></om:OMS><om:OMS base="http://www.gap-system.org/" module="Types" name="object"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#705.25.22:710.25.27"/></metadata></om:OMS>
+              <om:OMS base="http://www.gap-system.org" module="Types" name="booleans"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#718.26.11:725.26.18"/></metadata></om:OMS><om:OMS base="http://www.gap-system.org" module="Types" name="object"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#729.26.22:734.26.27"/></metadata></om:OMS>
       </om:OMA></om:OMOBJ></type>
        
        
      </constant><constant name="gapint">
-       <metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#715.26.1:743.26.29"/></metadata>
-       <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#724.26.10:740.26.26"/></metadata>
+       <metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#739.27.1:766.27.28"/><meta property="http://gl.mathhub.info/MMT/LFX/TypedHierarchy?Symbols?TypeLevel"><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://cds.omdoc.org/urtheories" module="Typed" name="type"></om:OMS></om:OMOBJ></meta></metadata>
+       <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#748.27.10:764.27.26"/></metadata>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="integers"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#724.26.10:731.26.17"/></metadata></om:OMS><om:OMS base="http://www.gap-system.org/" module="Types" name="object"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#735.26.21:740.26.26"/></metadata></om:OMS>
+              <om:OMS base="http://www.gap-system.org" module="Types" name="integers"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#748.27.10:755.27.17"/></metadata></om:OMS><om:OMS base="http://www.gap-system.org" module="Types" name="object"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#759.27.21:764.27.26"/></metadata></om:OMS>
       </om:OMA></om:OMOBJ></type>
        
        
      </constant><constant name="gapfloat">
-       <metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#745.27.1:773.27.29"/></metadata>
-       <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#756.27.12:770.27.26"/></metadata>
+       <metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#769.28.1:796.28.28"/><meta property="http://gl.mathhub.info/MMT/LFX/TypedHierarchy?Symbols?TypeLevel"><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://cds.omdoc.org/urtheories" module="Typed" name="type"></om:OMS></om:OMOBJ></meta></metadata>
+       <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#780.28.12:794.28.26"/></metadata>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="floats"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#756.27.12:761.27.17"/></metadata></om:OMS><om:OMS base="http://www.gap-system.org/" module="Types" name="object"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#765.27.21:770.27.26"/></metadata></om:OMS>
+              <om:OMS base="http://www.gap-system.org" module="Types" name="floats"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#780.28.12:785.28.17"/></metadata></om:OMS><om:OMS base="http://www.gap-system.org" module="Types" name="object"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#789.28.21:794.28.26"/></metadata></om:OMS>
       </om:OMA></om:OMOBJ></type>
        
        
      </constant><constant name="trueI">
-       <metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#777.29.1:805.29.29"/></metadata>
-       <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#785.29.9:802.29.26"/></metadata>
+       <metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#801.30.1:828.30.28"/><meta property="http://gl.mathhub.info/MMT/LFX/TypedHierarchy?Symbols?TypeLevel"><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://cds.omdoc.org/urtheories" module="Typed" name="type"></om:OMS></om:OMOBJ></meta></metadata>
+       <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#809.30.9:826.30.26"/></metadata>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="ded"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#785.29.9:787.29.11"/></metadata></om:OMS><om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#789.29.13:802.29.26"/></metadata>
+              <om:OMS base="http://www.gap-system.org" module="Types" name="ded"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#809.30.9:811.30.11"/></metadata></om:OMS><om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#813.30.13:826.30.26"/></metadata>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="gapbool"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#790.29.14:796.29.20"/></metadata></om:OMS><om:OMLIT type="http://www.gap-system.org/?Types?booleans" value="true"/>
+              <om:OMS base="http://www.gap-system.org" module="Types" name="gapbool"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#814.30.14:820.30.20"/></metadata></om:OMS><om:OMLIT type="http://www.gap-system.org/?Types?booleans" value="true"/>
       </om:OMA>
       </om:OMA></om:OMOBJ></type>
        
        
      </constant><constant name="catFilter">
-       <metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#807.30.1:838.30.32"/></metadata>
-       <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#819.30.13:835.30.29"/></metadata>
+       <metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#831.31.1:861.31.31"/><meta property="http://gl.mathhub.info/MMT/LFX/TypedHierarchy?Symbols?TypeLevel"><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://cds.omdoc.org/urtheories" module="Kinded" name="kind"></om:OMS></om:OMOBJ></meta></metadata>
+       <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#843.31.13:859.31.29"/></metadata>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="category"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#819.30.13:826.30.20"/></metadata></om:OMS><om:OMS base="http://www.gap-system.org/" module="Types" name="filter"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#830.30.24:835.30.29"/></metadata></om:OMS>
+              <om:OMS base="http://www.gap-system.org" module="Types" name="category"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#843.31.13:850.31.20"/></metadata></om:OMS><om:OMS base="http://www.gap-system.org" module="Types" name="filter"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#854.31.24:859.31.29"/></metadata></om:OMS>
       </om:OMA></om:OMOBJ></type>
        
        
      </constant><constant name="propertyFilter">
-       <metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#840.31.1:907.31.68"/></metadata>
-       <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#857.31.18:882.31.43"/></metadata>
+       <metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#864.32.1:930.32.67"/></metadata>
+       <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#881.32.18:906.32.43"/></metadata>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="object"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#858.31.19:863.31.24"/></metadata></om:OMS><om:OMS base="http://www.gap-system.org/" module="Types" name="object"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#867.31.28:872.31.33"/></metadata></om:OMS>
-      </om:OMA><om:OMS base="http://www.gap-system.org/" module="Types" name="filter"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#877.31.38:882.31.43"/></metadata></om:OMS>
+              <om:OMS base="http://www.gap-system.org" module="Types" name="object"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#882.32.19:887.32.24"/></metadata></om:OMS><om:OMS base="http://www.gap-system.org" module="Types" name="object"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#891.32.28:896.32.33"/></metadata></om:OMS>
+      </om:OMA><om:OMS base="http://www.gap-system.org" module="Types" name="filter"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#901.32.38:906.32.43"/></metadata></om:OMS>
       </om:OMA></om:OMOBJ></type>
-       <definition><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMBIND><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#888.31.49:904.31.65"/></metadata>
+       <definition><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMBIND><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#912.32.49:928.32.65"/></metadata>
                  <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="lambda"></om:OMS>
-                 <om:OMBVAR><om:OMV name="p"><metadata><tag property="http://cds.omdoc.org/mmt?mmt?inferred-type"/><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#889.31.50:889.31.50"/></metadata><type><om:OMA>
+                 <om:OMBVAR><om:OMV name="p"><metadata><tag property="http://cds.omdoc.org/mmt?mmt?inferred-type"/><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#913.32.50:913.32.50"/></metadata><type><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="object"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#858.31.19:863.31.24"/></metadata></om:OMS><om:OMS base="http://www.gap-system.org/" module="Types" name="object"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#867.31.28:872.31.33"/></metadata></om:OMS>
+              <om:OMS base="http://www.gap-system.org" module="Types" name="object"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#882.32.19:887.32.24"/></metadata></om:OMS><om:OMS base="http://www.gap-system.org" module="Types" name="object"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#891.32.28:896.32.33"/></metadata></om:OMS>
       </om:OMA></type></om:OMV></om:OMBVAR>
-                 <om:OMBIND><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#892.31.53:904.31.65"/></metadata>
+                 <om:OMBIND><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#916.32.53:928.32.65"/></metadata>
                  <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="lambda"></om:OMS>
-                 <om:OMBVAR><om:OMV name="o"><metadata><tag property="http://cds.omdoc.org/mmt?mmt?inferred-type"/><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#893.31.54:893.31.54"/></metadata><type><om:OMS base="http://www.gap-system.org/" module="Types" name="object"></om:OMS></type></om:OMV></om:OMBVAR>
-                 <om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#896.31.57:904.31.65"/></metadata>
+                 <om:OMBVAR><om:OMV name="o"><metadata><tag property="http://cds.omdoc.org/mmt?mmt?inferred-type"/><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#917.32.54:917.32.54"/></metadata><type><om:OMS base="http://www.gap-system.org" module="Types" name="object"></om:OMS></type></om:OMV></om:OMBVAR>
+                 <om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#920.32.57:928.32.65"/></metadata>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="ded"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#896.31.57:898.31.59"/></metadata></om:OMS><om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#900.31.61:904.31.65"/></metadata>
+              <om:OMS base="http://www.gap-system.org" module="Types" name="ded"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#920.32.57:922.32.59"/></metadata></om:OMS><om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#924.32.61:928.32.65"/></metadata>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMV name="p"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#901.31.62:901.31.62"/></metadata></om:OMV><om:OMV name="o"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#903.31.64:903.31.64"/></metadata></om:OMV>
+              <om:OMV name="p"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#925.32.62:925.32.62"/></metadata></om:OMV><om:OMV name="o"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#927.32.64:927.32.64"/></metadata></om:OMV>
       </om:OMA>
       </om:OMA>
       </om:OMBIND>
       </om:OMBIND></om:OMOBJ></definition>
        
      </constant><constant name="Has">
-       <metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#911.33.1:945.33.35"/></metadata>
-       <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#917.33.7:942.33.32"/></metadata>
+       <metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#935.34.1:968.34.34"/><meta property="http://gl.mathhub.info/MMT/LFX/TypedHierarchy?Symbols?TypeLevel"><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://cds.omdoc.org/urtheories" module="Kinded" name="kind"></om:OMS></om:OMOBJ></meta></metadata>
+       <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#941.34.7:966.34.32"/></metadata>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
-              <om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#917.33.7:933.33.23"/></metadata>
+              <om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#941.34.7:957.34.23"/></metadata>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="object"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#918.33.8:923.33.13"/></metadata></om:OMS><om:OMS base="http://www.gap-system.org/" module="Types" name="object"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#927.33.17:932.33.22"/></metadata></om:OMS>
-      </om:OMA><om:OMS base="http://www.gap-system.org/" module="Types" name="filter"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#937.33.27:942.33.32"/></metadata></om:OMS>
+              <om:OMS base="http://www.gap-system.org" module="Types" name="object"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#942.34.8:947.34.13"/></metadata></om:OMS><om:OMS base="http://www.gap-system.org" module="Types" name="object"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#951.34.17:956.34.22"/></metadata></om:OMS>
+      </om:OMA><om:OMS base="http://www.gap-system.org" module="Types" name="filter"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#961.34.27:966.34.32"/></metadata></om:OMS>
       </om:OMA></om:OMOBJ></type>
        
        
      </constant><constant name="CategoryCollection">
-       <metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#947.34.1:987.34.41"/></metadata>
-       <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#968.34.22:984.34.38"/></metadata>
+       <metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#971.35.1:1010.35.40"/><meta property="http://gl.mathhub.info/MMT/LFX/TypedHierarchy?Symbols?TypeLevel"><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://cds.omdoc.org/urtheories" module="Typed" name="type"></om:OMS></om:OMOBJ></meta></metadata>
+       <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#992.35.22:1008.35.38"/></metadata>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="filter"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#968.34.22:973.34.27"/></metadata></om:OMS><om:OMS base="http://www.gap-system.org/" module="Types" name="category"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#977.34.31:984.34.38"/></metadata></om:OMS>
+              <om:OMS base="http://www.gap-system.org" module="Types" name="filter"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#992.35.22:997.35.27"/></metadata></om:OMS><om:OMS base="http://www.gap-system.org" module="Types" name="category"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#1001.35.31:1008.35.38"/></metadata></om:OMS>
       </om:OMA></om:OMOBJ></type>
        
        
      </constant><constant name="Set">
-       <metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#989.35.1:1023.35.35"/></metadata>
-       <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#995.35.7:1020.35.32"/></metadata>
+       <metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#1013.36.1:1046.36.34"/><meta property="http://gl.mathhub.info/MMT/LFX/TypedHierarchy?Symbols?TypeLevel"><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://cds.omdoc.org/urtheories" module="Typed" name="type"></om:OMS></om:OMOBJ></meta></metadata>
+       <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#1019.36.7:1044.36.32"/></metadata>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="filter"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#995.35.7:1000.35.12"/></metadata></om:OMS><om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#1004.35.16:1020.35.32"/></metadata>
+              <om:OMS base="http://www.gap-system.org" module="Types" name="filter"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#1019.36.7:1024.36.12"/></metadata></om:OMS><om:OMA><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#1028.36.16:1044.36.32"/></metadata>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="object"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#1005.35.17:1010.35.22"/></metadata></om:OMS><om:OMS base="http://www.gap-system.org/" module="Types" name="object"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#1014.35.26:1019.35.31"/></metadata></om:OMS>
+              <om:OMS base="http://www.gap-system.org" module="Types" name="object"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#1029.36.17:1034.36.22"/></metadata></om:OMS><om:OMS base="http://www.gap-system.org" module="Types" name="object"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#1038.36.26:1043.36.31"/></metadata></om:OMS>
       </om:OMA>
       </om:OMA></om:OMOBJ></type>
        
        
      </constant><constant name="IsBool">
-       <metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#1025.36.1:1044.36.20"/></metadata>
-       <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="category"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#1034.36.10:1041.36.17"/></metadata></om:OMS></om:OMOBJ></type>
+       <metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#1049.37.1:1067.37.19"/><meta property="http://gl.mathhub.info/MMT/LFX/TypedHierarchy?Symbols?TypeLevel"><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://cds.omdoc.org/urtheories" module="Typed" name="type"></om:OMS></om:OMOBJ></meta></metadata>
+       <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org" module="Types" name="category"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#1058.37.10:1065.37.17"/></metadata></om:OMS></om:OMOBJ></type>
        
        
      </constant><constant name="IsObject">
-       <metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#1046.37.1:1067.37.22"/></metadata>
-       <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="category"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#1057.37.12:1064.37.19"/></metadata></om:OMS></om:OMOBJ></type>
+       <metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#1070.38.1:1090.38.21"/><meta property="http://gl.mathhub.info/MMT/LFX/TypedHierarchy?Symbols?TypeLevel"><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://cds.omdoc.org/urtheories" module="Typed" name="type"></om:OMS></om:OMOBJ></meta></metadata>
+       <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org" module="Types" name="category"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#1081.38.12:1088.38.19"/></metadata></om:OMS></om:OMOBJ></type>
        
        
      </constant></theory></omdoc>
\ No newline at end of file
diff --git a/content/http..www.gap-system.org/grp/perf.omdoc b/content/http..www.gap-system.org/grp/perf.omdoc
index 86b0e64a91ac4ce0a42ae9382159e400618a3c48..d06c2469deb3631920f5deeb04e5e2cc0593f508 100644
--- a/content/http..www.gap-system.org/grp/perf.omdoc
+++ b/content/http..www.gap-system.org/grp/perf.omdoc
@@ -12,13 +12,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/grp" module="perf" name="IsPerfectLibraryGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -36,13 +36,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/grp" module="perf" name="IsPerfectLibraryGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -60,13 +60,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/grp" module="perf" name="IsPerfectLibraryGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -84,13 +84,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/grp" module="perf" name="IsPerfectLibraryGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -108,13 +108,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/grp" module="perf" name="IsPerfectLibraryGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -132,13 +132,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/grp" module="perf" name="IsPerfectLibraryGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -162,13 +162,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/grp" module="perf" name="IsPerfectLibraryGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -186,13 +186,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/grp" module="perf" name="IsPerfectLibraryGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -216,13 +216,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/grp" module="perf" name="IsPerfectLibraryGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -246,13 +246,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/grp" module="perf" name="IsPerfectLibraryGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -276,13 +276,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/grp" module="perf" name="IsPerfectLibraryGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -306,13 +306,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/grp" module="perf" name="IsPerfectLibraryGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -330,13 +330,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/grp" module="perf" name="IsPerfectLibraryGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagma"></om:OMS>
       </om:OMA>
@@ -354,13 +354,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/grp" module="perf" name="IsPerfectLibraryGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithOne"></om:OMS>
       </om:OMA>
@@ -378,13 +378,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/grp" module="perf" name="IsPerfectLibraryGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithInversesIfNonzero"></om:OMS>
       </om:OMA>
@@ -402,13 +402,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/grp" module="perf" name="IsPerfectLibraryGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithInverses"></om:OMS>
       </om:OMA>
@@ -426,13 +426,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/grp" module="perf" name="IsPerfectLibraryGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsAssociative"></om:OMS>
       </om:OMA>
@@ -450,13 +450,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/grp" module="perf" name="IsPerfectLibraryGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsAssociative"></om:OMS>
       </om:OMA>
@@ -474,13 +474,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/grp" module="perf" name="IsPerfectLibraryGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="MultiplicativeNeutralElement"></om:OMS>
       </om:OMA>
@@ -498,13 +498,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/grp" module="perf" name="IsPerfectLibraryGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsGeneratorsOfSemigroup"></om:OMS>
       </om:OMA>
@@ -522,13 +522,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/grp" module="perf" name="IsPerfectLibraryGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsGeneratorsOfSemigroup"></om:OMS>
       </om:OMA>
@@ -546,13 +546,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/grp" module="perf" name="IsPerfectLibraryGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsSimpleSemigroup"></om:OMS>
       </om:OMA>
@@ -570,13 +570,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/grp" module="perf" name="IsPerfectLibraryGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsSimpleSemigroup"></om:OMS>
       </om:OMA>
@@ -594,13 +594,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/grp" module="perf" name="IsPerfectLibraryGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsRegularSemigroup"></om:OMS>
       </om:OMA>
@@ -618,13 +618,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/grp" module="perf" name="IsPerfectLibraryGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsRegularSemigroup"></om:OMS>
       </om:OMA>
@@ -642,13 +642,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/grp" module="perf" name="IsPerfectLibraryGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsInverseSemigroup"></om:OMS>
       </om:OMA>
@@ -666,13 +666,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/grp" module="perf" name="IsPerfectLibraryGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsInverseSemigroup"></om:OMS>
       </om:OMA>
@@ -690,13 +690,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/grp" module="perf" name="IsPerfectLibraryGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsCompletelyRegularSemigroup"></om:OMS>
       </om:OMA>
@@ -714,13 +714,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/grp" module="perf" name="IsPerfectLibraryGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsCompletelyRegularSemigroup"></om:OMS>
       </om:OMA>
@@ -738,13 +738,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/grp" module="perf" name="IsPerfectLibraryGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsGroupAsSemigroup"></om:OMS>
       </om:OMA>
@@ -762,13 +762,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/grp" module="perf" name="IsPerfectLibraryGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsGroupAsSemigroup"></om:OMS>
       </om:OMA>
@@ -786,13 +786,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/grp" module="perf" name="IsPerfectLibraryGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsMonoidAsSemigroup"></om:OMS>
       </om:OMA>
@@ -810,13 +810,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/grp" module="perf" name="IsPerfectLibraryGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsMonoidAsSemigroup"></om:OMS>
       </om:OMA>
@@ -834,13 +834,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/grp" module="perf" name="IsPerfectLibraryGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsOrthodoxSemigroup"></om:OMS>
       </om:OMA>
@@ -858,13 +858,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/grp" module="perf" name="IsPerfectLibraryGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsOrthodoxSemigroup"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/addcoset.omdoc b/content/http..www.gap-system.org/lib/addcoset.omdoc
index 0ba2fb97063d26e3c2a8bdd42d83433a92232b44..9a54f60a8c3e14a59ba80d71fea7b15214810a71 100644
--- a/content/http..www.gap-system.org/lib/addcoset.omdoc
+++ b/content/http..www.gap-system.org/lib/addcoset.omdoc
@@ -12,13 +12,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addcoset" name="IsAdditiveCoset"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -36,13 +36,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addcoset" name="IsAdditiveCoset"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -60,13 +60,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addcoset" name="IsAdditiveCoset"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -84,13 +84,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addcoset" name="IsAdditiveCoset"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -108,13 +108,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addcoset" name="IsAdditiveCoset"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -132,13 +132,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addcoset" name="IsAdditiveCoset"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -156,13 +156,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addcoset" name="IsAdditiveCoset"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -180,13 +180,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addcoset" name="IsAdditiveCoset"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -204,13 +204,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addcoset" name="IsAdditiveCoset"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extaset" name="IsExtASet"></om:OMS>
       </om:OMA>
@@ -228,13 +228,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addcoset" name="IsAdditiveCoset"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extaset" name="IsAssociativeAOpESum"></om:OMS>
       </om:OMA>
@@ -252,13 +252,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addcoset" name="IsAdditiveCoset"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extaset" name="IsTrivialAOpEZero"></om:OMS>
       </om:OMA>
@@ -289,10 +289,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="addcoset" name="IsAdditiveCosetDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="addcoset" name="IsAdditiveCosetDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/addmagma.omdoc b/content/http..www.gap-system.org/lib/addmagma.omdoc
index e1397fb7a02a5417a2ef1ccaeb4ae27db9ede3c8..d67bca4aa2fefe628d20c31557d702df0d8ecbba 100644
--- a/content/http..www.gap-system.org/lib/addmagma.omdoc
+++ b/content/http..www.gap-system.org/lib/addmagma.omdoc
@@ -12,13 +12,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagma"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -36,13 +36,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagma"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -60,13 +60,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagma"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -84,13 +84,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagma"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -108,13 +108,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagma"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -132,13 +132,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagma"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -162,13 +162,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagma"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -192,13 +192,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagma"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -207,7 +207,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?addmagma"></import><constant name="IsNearAdditiveMagmaWithZero">
+     </constant><constant name="IsNearAdditiveMagmaWithZero">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="category"></om:OMS></om:OMOBJ></type>
        
@@ -221,13 +221,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagmaWithZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -245,13 +245,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagmaWithZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -269,13 +269,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagmaWithZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -293,13 +293,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagmaWithZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -317,13 +317,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagmaWithZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -341,13 +341,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagmaWithZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -371,13 +371,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagmaWithZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -401,13 +401,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagmaWithZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -431,13 +431,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagmaWithZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -455,13 +455,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagmaWithZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagma"></om:OMS>
       </om:OMA>
@@ -484,13 +484,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -508,13 +508,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -532,13 +532,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -556,13 +556,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -580,13 +580,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -604,13 +604,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -634,13 +634,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -664,13 +664,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -694,13 +694,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -724,13 +724,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -748,13 +748,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagma"></om:OMS>
       </om:OMA>
@@ -772,13 +772,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagmaWithZero"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/adjoin.omdoc b/content/http..www.gap-system.org/lib/adjoin.omdoc
index 51b17fe2fb3e2ca6068d85992aef0371b20a718c..6a1ad437f320618b9ba101d2af67f2c3c8eed625 100644
--- a/content/http..www.gap-system.org/lib/adjoin.omdoc
+++ b/content/http..www.gap-system.org/lib/adjoin.omdoc
@@ -12,13 +12,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="adjoin" name="IsMonoidByAdjoiningIdentityElt"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -36,13 +36,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="adjoin" name="IsMonoidByAdjoiningIdentityElt"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -60,13 +60,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="adjoin" name="IsMonoidByAdjoiningIdentityElt"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -84,13 +84,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="adjoin" name="IsMonoidByAdjoiningIdentityElt"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -108,13 +108,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="adjoin" name="IsMonoidByAdjoiningIdentityElt"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -123,7 +123,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?adjoin"></import><constant name="UnderlyingSemigroupElementOfMonoidByAdjoiningIdentityElt">
+     </constant><constant name="UnderlyingSemigroupElementOfMonoidByAdjoiningIdentityElt">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
@@ -177,13 +177,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="adjoin" name="IsMonoidByAdjoiningIdentity"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -201,13 +201,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="adjoin" name="IsMonoidByAdjoiningIdentity"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -225,13 +225,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="adjoin" name="IsMonoidByAdjoiningIdentity"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -249,13 +249,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="adjoin" name="IsMonoidByAdjoiningIdentity"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -273,13 +273,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="adjoin" name="IsMonoidByAdjoiningIdentity"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -297,13 +297,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="adjoin" name="IsMonoidByAdjoiningIdentity"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -327,13 +327,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="adjoin" name="IsMonoidByAdjoiningIdentity"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -351,13 +351,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="adjoin" name="IsMonoidByAdjoiningIdentity"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -381,13 +381,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="adjoin" name="IsMonoidByAdjoiningIdentity"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -411,13 +411,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="adjoin" name="IsMonoidByAdjoiningIdentity"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -441,13 +441,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="adjoin" name="IsMonoidByAdjoiningIdentity"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -465,13 +465,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="adjoin" name="IsMonoidByAdjoiningIdentity"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagma"></om:OMS>
       </om:OMA>
@@ -489,13 +489,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="adjoin" name="IsMonoidByAdjoiningIdentity"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithOne"></om:OMS>
       </om:OMA>
@@ -513,13 +513,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="adjoin" name="IsMonoidByAdjoiningIdentity"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsAssociative"></om:OMS>
       </om:OMA>
@@ -537,13 +537,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="adjoin" name="IsMonoidByAdjoiningIdentity"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsAssociative"></om:OMS>
       </om:OMA>
@@ -561,13 +561,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="adjoin" name="IsMonoidByAdjoiningIdentity"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="MultiplicativeNeutralElement"></om:OMS>
       </om:OMA>
@@ -585,13 +585,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="adjoin" name="IsMonoidByAdjoiningIdentity"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsGeneratorsOfSemigroup"></om:OMS>
       </om:OMA>
@@ -609,13 +609,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="adjoin" name="IsMonoidByAdjoiningIdentity"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsGeneratorsOfSemigroup"></om:OMS>
       </om:OMA>
@@ -633,13 +633,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="adjoin" name="IsMonoidByAdjoiningIdentity"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsMonoidAsSemigroup"></om:OMS>
       </om:OMA>
@@ -657,13 +657,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="adjoin" name="IsMonoidByAdjoiningIdentity"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsMonoidAsSemigroup"></om:OMS>
       </om:OMA>
@@ -702,10 +702,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="adjoin" name="IsMonoidByAdjoiningIdentityEltRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="adjoin" name="IsMonoidByAdjoiningIdentityEltRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/algebra.omdoc b/content/http..www.gap-system.org/lib/algebra.omdoc
index 798d3056a11e384a256868d6ad6d8665dc4f40a0..9389907766b3c06fb450f753531000ddf868c50e 100644
--- a/content/http..www.gap-system.org/lib/algebra.omdoc
+++ b/content/http..www.gap-system.org/lib/algebra.omdoc
@@ -36,13 +36,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algebra" name="IsQuaternion"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -60,13 +60,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algebra" name="IsQuaternion"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -84,13 +84,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algebra" name="IsQuaternion"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -108,13 +108,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algebra" name="IsQuaternion"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -132,13 +132,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algebra" name="IsQuaternion"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -156,13 +156,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algebra" name="IsQuaternion"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -180,13 +180,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algebra" name="IsQuaternion"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -204,13 +204,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algebra" name="IsQuaternion"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -228,13 +228,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algebra" name="IsQuaternion"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -252,13 +252,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algebra" name="IsQuaternion"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -276,13 +276,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algebra" name="IsQuaternion"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsAssociative"></om:OMS>
       </om:OMA>
@@ -300,13 +300,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algebra" name="IsQuaternion"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsAssociative"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/algfld.omdoc b/content/http..www.gap-system.org/lib/algfld.omdoc
index 7b40e3f1336a7804d24d55fa990c41729921ac9c..8e37a661eb46e7dd0730943c818839c90e392cc2 100644
--- a/content/http..www.gap-system.org/lib/algfld.omdoc
+++ b/content/http..www.gap-system.org/lib/algfld.omdoc
@@ -12,13 +12,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -36,13 +36,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -60,13 +60,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsNonTrivial"></om:OMS>
       </om:OMA>
@@ -84,13 +84,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsNonTrivial"></om:OMS>
       </om:OMA>
@@ -108,13 +108,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -132,13 +132,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -156,13 +156,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -180,13 +180,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -210,13 +210,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -240,13 +240,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -270,13 +270,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -300,13 +300,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -330,13 +330,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -354,13 +354,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -384,13 +384,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -408,13 +408,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -438,13 +438,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -468,13 +468,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -498,13 +498,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -522,13 +522,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsExtLSet"></om:OMS>
       </om:OMA>
@@ -546,13 +546,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpDProd"></om:OMS>
       </om:OMA>
@@ -570,13 +570,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpEProd"></om:OMS>
       </om:OMA>
@@ -594,13 +594,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpDSum"></om:OMS>
       </om:OMA>
@@ -618,13 +618,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpESum"></om:OMS>
       </om:OMA>
@@ -642,13 +642,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsTrivialLOpEOne"></om:OMS>
       </om:OMA>
@@ -666,13 +666,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnByRing"></om:OMS>
       </om:OMA>
@@ -690,13 +690,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnByDivisionRing"></om:OMS>
       </om:OMA>
@@ -714,13 +714,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnByDivisionRing"></om:OMS>
       </om:OMA>
@@ -738,13 +738,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagma"></om:OMS>
       </om:OMA>
@@ -762,13 +762,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithOne"></om:OMS>
       </om:OMA>
@@ -786,13 +786,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithInversesIfNonzero"></om:OMS>
       </om:OMA>
@@ -810,13 +810,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsAssociative"></om:OMS>
       </om:OMA>
@@ -834,13 +834,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsAssociative"></om:OMS>
       </om:OMA>
@@ -858,13 +858,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsCommutative"></om:OMS>
       </om:OMA>
@@ -882,13 +882,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsCommutative"></om:OMS>
       </om:OMA>
@@ -906,13 +906,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="MultiplicativeNeutralElement"></om:OMS>
       </om:OMA>
@@ -930,13 +930,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsGeneratorsOfSemigroup"></om:OMS>
       </om:OMA>
@@ -954,13 +954,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsGeneratorsOfSemigroup"></om:OMS>
       </om:OMA>
@@ -978,13 +978,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsMonoidAsSemigroup"></om:OMS>
       </om:OMA>
@@ -1002,13 +1002,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsMonoidAsSemigroup"></om:OMS>
       </om:OMA>
@@ -1026,13 +1026,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagma"></om:OMS>
       </om:OMA>
@@ -1050,13 +1050,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagmaWithZero"></om:OMS>
       </om:OMA>
@@ -1074,13 +1074,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveGroup"></om:OMS>
       </om:OMA>
@@ -1098,13 +1098,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -1122,13 +1122,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -1146,13 +1146,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsLDistributive"></om:OMS>
       </om:OMA>
@@ -1170,13 +1170,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsLDistributive"></om:OMS>
       </om:OMA>
@@ -1194,13 +1194,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsRDistributive"></om:OMS>
       </om:OMA>
@@ -1218,13 +1218,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsRDistributive"></om:OMS>
       </om:OMA>
@@ -1242,13 +1242,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsUniqueFactorizationRing"></om:OMS>
       </om:OMA>
@@ -1266,13 +1266,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsEuclideanRing"></om:OMS>
       </om:OMA>
@@ -1290,13 +1290,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsIntegralRing"></om:OMS>
       </om:OMA>
@@ -1314,13 +1314,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsIntegralRing"></om:OMS>
       </om:OMA>
@@ -1338,13 +1338,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFreeLeftModule"></om:OMS>
       </om:OMA>
@@ -1353,7 +1353,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?algfld"></import><constant name="DefectApproximation">
+     </constant><constant name="DefectApproximation">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
@@ -1391,10 +1391,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1409,10 +1409,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1427,10 +1427,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -1448,10 +1448,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -1469,10 +1469,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsNonTrivial"></om:OMS>
       </om:OMA>
@@ -1490,10 +1490,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsNonTrivial"></om:OMS>
       </om:OMA>
@@ -1511,10 +1511,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1532,10 +1532,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1553,10 +1553,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -1574,10 +1574,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1601,10 +1601,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1628,10 +1628,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1655,10 +1655,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1682,10 +1682,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1709,10 +1709,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -1730,10 +1730,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1757,10 +1757,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -1778,10 +1778,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1805,10 +1805,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1832,10 +1832,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1859,10 +1859,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -1880,10 +1880,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsExtLSet"></om:OMS>
       </om:OMA>
@@ -1901,10 +1901,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpDProd"></om:OMS>
       </om:OMA>
@@ -1922,10 +1922,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpEProd"></om:OMS>
       </om:OMA>
@@ -1943,10 +1943,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpDSum"></om:OMS>
       </om:OMA>
@@ -1964,10 +1964,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpESum"></om:OMS>
       </om:OMA>
@@ -1985,10 +1985,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsTrivialLOpEOne"></om:OMS>
       </om:OMA>
@@ -2006,10 +2006,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnByRing"></om:OMS>
       </om:OMA>
@@ -2027,10 +2027,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnByDivisionRing"></om:OMS>
       </om:OMA>
@@ -2048,10 +2048,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnByDivisionRing"></om:OMS>
       </om:OMA>
@@ -2069,10 +2069,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagma"></om:OMS>
       </om:OMA>
@@ -2090,10 +2090,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithOne"></om:OMS>
       </om:OMA>
@@ -2111,10 +2111,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithInversesIfNonzero"></om:OMS>
       </om:OMA>
@@ -2132,10 +2132,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsAssociative"></om:OMS>
       </om:OMA>
@@ -2153,10 +2153,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsAssociative"></om:OMS>
       </om:OMA>
@@ -2174,10 +2174,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsCommutative"></om:OMS>
       </om:OMA>
@@ -2195,10 +2195,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsCommutative"></om:OMS>
       </om:OMA>
@@ -2216,10 +2216,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="MultiplicativeNeutralElement"></om:OMS>
       </om:OMA>
@@ -2237,10 +2237,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsGeneratorsOfSemigroup"></om:OMS>
       </om:OMA>
@@ -2258,10 +2258,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsGeneratorsOfSemigroup"></om:OMS>
       </om:OMA>
@@ -2279,10 +2279,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsMonoidAsSemigroup"></om:OMS>
       </om:OMA>
@@ -2300,10 +2300,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsMonoidAsSemigroup"></om:OMS>
       </om:OMA>
@@ -2321,10 +2321,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagma"></om:OMS>
       </om:OMA>
@@ -2342,10 +2342,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagmaWithZero"></om:OMS>
       </om:OMA>
@@ -2363,10 +2363,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveGroup"></om:OMS>
       </om:OMA>
@@ -2384,10 +2384,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -2405,10 +2405,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -2426,10 +2426,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsLDistributive"></om:OMS>
       </om:OMA>
@@ -2447,10 +2447,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsLDistributive"></om:OMS>
       </om:OMA>
@@ -2468,10 +2468,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsRDistributive"></om:OMS>
       </om:OMA>
@@ -2489,10 +2489,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsRDistributive"></om:OMS>
       </om:OMA>
@@ -2510,10 +2510,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsUniqueFactorizationRing"></om:OMS>
       </om:OMA>
@@ -2531,10 +2531,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsEuclideanRing"></om:OMS>
       </om:OMA>
@@ -2552,10 +2552,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsIntegralRing"></om:OMS>
       </om:OMA>
@@ -2573,10 +2573,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsIntegralRing"></om:OMS>
       </om:OMA>
@@ -2594,10 +2594,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFreeLeftModule"></om:OMS>
       </om:OMA>
@@ -2615,10 +2615,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtensionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicExtension"></om:OMS>
       </om:OMA>
@@ -2641,13 +2641,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -2665,13 +2665,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -2689,13 +2689,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -2713,13 +2713,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -2737,13 +2737,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -2761,13 +2761,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -2785,13 +2785,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -2809,13 +2809,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -2833,13 +2833,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -2857,13 +2857,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -2881,13 +2881,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZDFRE"></om:OMS>
       </om:OMA>
@@ -2905,13 +2905,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -2929,13 +2929,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditivelyCommutativeElement"></om:OMS>
       </om:OMA>
@@ -2953,13 +2953,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsCommutativeElement"></om:OMS>
       </om:OMA>
@@ -2982,10 +2982,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgBFRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgBFRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -3000,10 +3000,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgBFRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgBFRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -3021,10 +3021,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgBFRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgBFRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -3042,10 +3042,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgBFRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgBFRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -3063,10 +3063,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgBFRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgBFRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -3084,10 +3084,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgBFRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgBFRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -3105,10 +3105,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgBFRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgBFRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -3126,10 +3126,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgBFRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgBFRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -3147,10 +3147,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgBFRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgBFRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -3168,10 +3168,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgBFRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgBFRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -3189,10 +3189,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgBFRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgBFRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -3210,10 +3210,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgBFRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgBFRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZDFRE"></om:OMS>
       </om:OMA>
@@ -3231,10 +3231,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgBFRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgBFRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -3252,10 +3252,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgBFRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgBFRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditivelyCommutativeElement"></om:OMS>
       </om:OMA>
@@ -3273,10 +3273,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgBFRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgBFRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsCommutativeElement"></om:OMS>
       </om:OMA>
@@ -3294,10 +3294,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgBFRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgBFRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicElement"></om:OMS>
       </om:OMA>
@@ -3328,10 +3328,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsKroneckerConstRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsKroneckerConstRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -3346,10 +3346,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsKroneckerConstRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsKroneckerConstRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -3367,10 +3367,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsKroneckerConstRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsKroneckerConstRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -3388,10 +3388,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsKroneckerConstRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsKroneckerConstRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -3409,10 +3409,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsKroneckerConstRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsKroneckerConstRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -3430,10 +3430,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsKroneckerConstRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsKroneckerConstRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -3451,10 +3451,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsKroneckerConstRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsKroneckerConstRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -3472,10 +3472,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsKroneckerConstRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsKroneckerConstRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -3493,10 +3493,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsKroneckerConstRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsKroneckerConstRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -3514,10 +3514,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsKroneckerConstRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsKroneckerConstRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -3535,10 +3535,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsKroneckerConstRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsKroneckerConstRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -3556,10 +3556,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsKroneckerConstRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsKroneckerConstRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZDFRE"></om:OMS>
       </om:OMA>
@@ -3577,10 +3577,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsKroneckerConstRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsKroneckerConstRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -3598,10 +3598,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsKroneckerConstRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsKroneckerConstRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditivelyCommutativeElement"></om:OMS>
       </om:OMA>
@@ -3619,10 +3619,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsKroneckerConstRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsKroneckerConstRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsCommutativeElement"></om:OMS>
       </om:OMA>
@@ -3640,10 +3640,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsKroneckerConstRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsKroneckerConstRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsAlgebraicElement"></om:OMS>
       </om:OMA>
@@ -3666,10 +3666,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsCanonicalBasisAlgebraicExtension"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsCanonicalBasisAlgebraicExtension"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsList"></om:OMS>
       </om:OMA>
@@ -3687,10 +3687,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsCanonicalBasisAlgebraicExtension"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsCanonicalBasisAlgebraicExtension"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDenseList"></om:OMS>
       </om:OMA>
@@ -3708,10 +3708,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsCanonicalBasisAlgebraicExtension"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsCanonicalBasisAlgebraicExtension"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsHomogeneousList"></om:OMS>
       </om:OMA>
@@ -3729,10 +3729,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsCanonicalBasisAlgebraicExtension"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsCanonicalBasisAlgebraicExtension"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -3747,10 +3747,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsCanonicalBasisAlgebraicExtension"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsCanonicalBasisAlgebraicExtension"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -3765,10 +3765,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsCanonicalBasisAlgebraicExtension"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsCanonicalBasisAlgebraicExtension"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -3786,10 +3786,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsCanonicalBasisAlgebraicExtension"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsCanonicalBasisAlgebraicExtension"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -3807,10 +3807,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsCanonicalBasisAlgebraicExtension"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsCanonicalBasisAlgebraicExtension"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -3828,10 +3828,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsCanonicalBasisAlgebraicExtension"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsCanonicalBasisAlgebraicExtension"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsBasis"></om:OMS>
       </om:OMA>
@@ -3849,10 +3849,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsCanonicalBasisAlgebraicExtension"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsCanonicalBasisAlgebraicExtension"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsCanonicalBasis"></om:OMS>
       </om:OMA>
@@ -3870,10 +3870,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsCanonicalBasisAlgebraicExtension"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfld" name="IsCanonicalBasisAlgebraicExtension"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsCanonicalBasis"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/algfp.omdoc b/content/http..www.gap-system.org/lib/algfp.omdoc
index deb647c3488b9e0f65dac9464599eb29daca1304..0a6a0a7285637724175c1068ea9d9c7f8629041e 100644
--- a/content/http..www.gap-system.org/lib/algfp.omdoc
+++ b/content/http..www.gap-system.org/lib/algfp.omdoc
@@ -20,10 +20,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -38,10 +38,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -56,10 +56,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -77,10 +77,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -98,10 +98,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -119,10 +119,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -140,10 +140,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -161,10 +161,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -188,10 +188,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -215,10 +215,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -242,10 +242,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -269,10 +269,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -296,10 +296,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -317,10 +317,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsExtLSet"></om:OMS>
       </om:OMA>
@@ -338,10 +338,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpEProd"></om:OMS>
       </om:OMA>
@@ -359,10 +359,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpDSum"></om:OMS>
       </om:OMA>
@@ -380,10 +380,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpESum"></om:OMS>
       </om:OMA>
@@ -401,10 +401,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsTrivialLOpEOne"></om:OMS>
       </om:OMA>
@@ -422,10 +422,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnByRing"></om:OMS>
       </om:OMA>
@@ -443,10 +443,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagma"></om:OMS>
       </om:OMA>
@@ -464,10 +464,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagmaWithZero"></om:OMS>
       </om:OMA>
@@ -485,10 +485,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveGroup"></om:OMS>
       </om:OMA>
@@ -506,10 +506,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -527,10 +527,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -548,10 +548,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFreeLeftModule"></om:OMS>
       </om:OMA>
@@ -569,10 +569,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsFpAlgebraElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsHandledByNiceBasis"></om:OMS>
       </om:OMA>
@@ -595,13 +595,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsElementOfFpAlgebra"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -619,13 +619,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsElementOfFpAlgebra"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -643,13 +643,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsElementOfFpAlgebra"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -667,13 +667,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsElementOfFpAlgebra"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -691,13 +691,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsElementOfFpAlgebra"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -715,13 +715,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsElementOfFpAlgebra"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -739,13 +739,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsElementOfFpAlgebra"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -763,13 +763,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsElementOfFpAlgebra"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -800,13 +800,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsSubalgebraFpAlgebra"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -824,13 +824,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsSubalgebraFpAlgebra"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -848,13 +848,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsSubalgebraFpAlgebra"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -872,13 +872,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsSubalgebraFpAlgebra"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -896,13 +896,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsSubalgebraFpAlgebra"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -920,13 +920,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsSubalgebraFpAlgebra"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -950,13 +950,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsSubalgebraFpAlgebra"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -980,13 +980,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsSubalgebraFpAlgebra"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1010,13 +1010,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsSubalgebraFpAlgebra"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1040,13 +1040,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsSubalgebraFpAlgebra"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1070,13 +1070,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsSubalgebraFpAlgebra"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -1094,13 +1094,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsSubalgebraFpAlgebra"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1124,13 +1124,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsSubalgebraFpAlgebra"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -1148,13 +1148,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsSubalgebraFpAlgebra"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1178,13 +1178,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsSubalgebraFpAlgebra"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1208,13 +1208,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsSubalgebraFpAlgebra"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -1232,13 +1232,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsSubalgebraFpAlgebra"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsExtLSet"></om:OMS>
       </om:OMA>
@@ -1256,13 +1256,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsSubalgebraFpAlgebra"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpDProd"></om:OMS>
       </om:OMA>
@@ -1280,13 +1280,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsSubalgebraFpAlgebra"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpEProd"></om:OMS>
       </om:OMA>
@@ -1304,13 +1304,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsSubalgebraFpAlgebra"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpDSum"></om:OMS>
       </om:OMA>
@@ -1328,13 +1328,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsSubalgebraFpAlgebra"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpESum"></om:OMS>
       </om:OMA>
@@ -1352,13 +1352,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsSubalgebraFpAlgebra"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsTrivialLOpEOne"></om:OMS>
       </om:OMA>
@@ -1376,13 +1376,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsSubalgebraFpAlgebra"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnByRing"></om:OMS>
       </om:OMA>
@@ -1400,13 +1400,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsSubalgebraFpAlgebra"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnByDivisionRing"></om:OMS>
       </om:OMA>
@@ -1424,13 +1424,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsSubalgebraFpAlgebra"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnByDivisionRing"></om:OMS>
       </om:OMA>
@@ -1448,13 +1448,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsSubalgebraFpAlgebra"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagma"></om:OMS>
       </om:OMA>
@@ -1472,13 +1472,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsSubalgebraFpAlgebra"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagma"></om:OMS>
       </om:OMA>
@@ -1496,13 +1496,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsSubalgebraFpAlgebra"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagmaWithZero"></om:OMS>
       </om:OMA>
@@ -1520,13 +1520,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsSubalgebraFpAlgebra"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveGroup"></om:OMS>
       </om:OMA>
@@ -1544,13 +1544,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsSubalgebraFpAlgebra"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -1568,13 +1568,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsSubalgebraFpAlgebra"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -1592,13 +1592,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsSubalgebraFpAlgebra"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsLDistributive"></om:OMS>
       </om:OMA>
@@ -1616,13 +1616,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsSubalgebraFpAlgebra"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsLDistributive"></om:OMS>
       </om:OMA>
@@ -1640,13 +1640,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsSubalgebraFpAlgebra"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsRDistributive"></om:OMS>
       </om:OMA>
@@ -1664,13 +1664,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsSubalgebraFpAlgebra"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsRDistributive"></om:OMS>
       </om:OMA>
@@ -1688,13 +1688,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algfp" name="IsSubalgebraFpAlgebra"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFreeLeftModule"></om:OMS>
       </om:OMA>
@@ -1703,7 +1703,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?algfp"></import><constant name="IsFullFpAlgebra">
+     </constant><constant name="IsFullFpAlgebra">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
diff --git a/content/http..www.gap-system.org/lib/alghom.omdoc b/content/http..www.gap-system.org/lib/alghom.omdoc
index 2ee4b183ff58118aac2a43cd4ca29b928186f3c1..ed680c303dc24e683511a623e03276cf5f5af4a8 100644
--- a/content/http..www.gap-system.org/lib/alghom.omdoc
+++ b/content/http..www.gap-system.org/lib/alghom.omdoc
@@ -60,10 +60,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -78,10 +78,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -96,10 +96,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -117,10 +117,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -138,10 +138,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -159,10 +159,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -180,10 +180,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -201,10 +201,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -222,10 +222,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -243,10 +243,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -264,10 +264,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -285,10 +285,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -306,10 +306,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -327,10 +327,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -348,10 +348,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -369,10 +369,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -390,10 +390,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsAddition"></om:OMS>
       </om:OMA>
@@ -411,10 +411,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsAddition"></om:OMS>
       </om:OMA>
@@ -432,10 +432,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsZero"></om:OMS>
       </om:OMA>
@@ -453,10 +453,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsZero"></om:OMS>
       </om:OMA>
@@ -474,10 +474,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsAdditiveInverses"></om:OMS>
       </om:OMA>
@@ -495,10 +495,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsAdditiveInverses"></om:OMS>
       </om:OMA>
@@ -516,10 +516,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsScalarMultiplication"></om:OMS>
       </om:OMA>
@@ -537,10 +537,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsScalarMultiplication"></om:OMS>
       </om:OMA>
@@ -549,7 +549,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?alghom"></import><constant name="IsPolynomialRingDefaultGeneratorMapping">
+     </constant><constant name="IsPolynomialRingDefaultGeneratorMapping">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="filter"></om:OMS></om:OMOBJ></type>
        
@@ -563,10 +563,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsPolynomialRingDefaultGeneratorMapping"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsPolynomialRingDefaultGeneratorMapping"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -581,10 +581,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsPolynomialRingDefaultGeneratorMapping"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsPolynomialRingDefaultGeneratorMapping"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -599,10 +599,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsPolynomialRingDefaultGeneratorMapping"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsPolynomialRingDefaultGeneratorMapping"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -620,10 +620,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsPolynomialRingDefaultGeneratorMapping"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsPolynomialRingDefaultGeneratorMapping"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -641,10 +641,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsPolynomialRingDefaultGeneratorMapping"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsPolynomialRingDefaultGeneratorMapping"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -662,10 +662,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsPolynomialRingDefaultGeneratorMapping"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsPolynomialRingDefaultGeneratorMapping"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -683,10 +683,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsPolynomialRingDefaultGeneratorMapping"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsPolynomialRingDefaultGeneratorMapping"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -704,10 +704,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsPolynomialRingDefaultGeneratorMapping"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsPolynomialRingDefaultGeneratorMapping"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -725,10 +725,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsPolynomialRingDefaultGeneratorMapping"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsPolynomialRingDefaultGeneratorMapping"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -746,10 +746,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsPolynomialRingDefaultGeneratorMapping"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsPolynomialRingDefaultGeneratorMapping"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -767,10 +767,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsPolynomialRingDefaultGeneratorMapping"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsPolynomialRingDefaultGeneratorMapping"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -788,10 +788,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsPolynomialRingDefaultGeneratorMapping"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsPolynomialRingDefaultGeneratorMapping"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -809,10 +809,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsPolynomialRingDefaultGeneratorMapping"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsPolynomialRingDefaultGeneratorMapping"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -830,10 +830,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsPolynomialRingDefaultGeneratorMapping"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsPolynomialRingDefaultGeneratorMapping"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -851,10 +851,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsPolynomialRingDefaultGeneratorMapping"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsPolynomialRingDefaultGeneratorMapping"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -872,10 +872,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsPolynomialRingDefaultGeneratorMapping"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsPolynomialRingDefaultGeneratorMapping"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -893,10 +893,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsPolynomialRingDefaultGeneratorMapping"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsPolynomialRingDefaultGeneratorMapping"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsAddition"></om:OMS>
       </om:OMA>
@@ -914,10 +914,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsPolynomialRingDefaultGeneratorMapping"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsPolynomialRingDefaultGeneratorMapping"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsAddition"></om:OMS>
       </om:OMA>
@@ -935,10 +935,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsPolynomialRingDefaultGeneratorMapping"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsPolynomialRingDefaultGeneratorMapping"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsZero"></om:OMS>
       </om:OMA>
@@ -956,10 +956,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsPolynomialRingDefaultGeneratorMapping"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsPolynomialRingDefaultGeneratorMapping"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsZero"></om:OMS>
       </om:OMA>
@@ -977,10 +977,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsPolynomialRingDefaultGeneratorMapping"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsPolynomialRingDefaultGeneratorMapping"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsAdditiveInverses"></om:OMS>
       </om:OMA>
@@ -998,10 +998,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsPolynomialRingDefaultGeneratorMapping"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsPolynomialRingDefaultGeneratorMapping"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsAdditiveInverses"></om:OMS>
       </om:OMA>
@@ -1019,10 +1019,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsPolynomialRingDefaultGeneratorMapping"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsPolynomialRingDefaultGeneratorMapping"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsScalarMultiplication"></om:OMS>
       </om:OMA>
@@ -1040,10 +1040,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsPolynomialRingDefaultGeneratorMapping"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsPolynomialRingDefaultGeneratorMapping"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsScalarMultiplication"></om:OMS>
       </om:OMA>
@@ -1061,10 +1061,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsPolynomialRingDefaultGeneratorMapping"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsPolynomialRingDefaultGeneratorMapping"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1092,10 +1092,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1110,10 +1110,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1128,10 +1128,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -1149,10 +1149,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -1170,10 +1170,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -1191,10 +1191,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -1212,10 +1212,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -1233,10 +1233,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -1254,10 +1254,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -1275,10 +1275,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -1296,10 +1296,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -1317,10 +1317,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -1338,10 +1338,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -1359,10 +1359,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -1380,10 +1380,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -1401,10 +1401,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -1422,10 +1422,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -1443,10 +1443,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -1464,10 +1464,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -1485,10 +1485,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -1506,10 +1506,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsAddition"></om:OMS>
       </om:OMA>
@@ -1527,10 +1527,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsAddition"></om:OMS>
       </om:OMA>
@@ -1548,10 +1548,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsZero"></om:OMS>
       </om:OMA>
@@ -1569,10 +1569,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsZero"></om:OMS>
       </om:OMA>
@@ -1590,10 +1590,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsAdditiveInverses"></om:OMS>
       </om:OMA>
@@ -1611,10 +1611,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsAdditiveInverses"></om:OMS>
       </om:OMA>
@@ -1632,10 +1632,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsScalarMultiplication"></om:OMS>
       </om:OMA>
@@ -1653,10 +1653,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsAlgebraHomomorphismFromFpRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsScalarMultiplication"></om:OMS>
       </om:OMA>
@@ -1703,10 +1703,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1721,10 +1721,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1739,10 +1739,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -1760,10 +1760,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -1781,10 +1781,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -1802,10 +1802,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -1823,10 +1823,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -1844,10 +1844,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -1865,10 +1865,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -1886,10 +1886,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -1907,10 +1907,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -1928,10 +1928,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -1949,10 +1949,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -1970,10 +1970,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -1991,10 +1991,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -2012,10 +2012,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -2033,10 +2033,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -2054,10 +2054,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -2075,10 +2075,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -2096,10 +2096,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -2117,10 +2117,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsAddition"></om:OMS>
       </om:OMA>
@@ -2138,10 +2138,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsAddition"></om:OMS>
       </om:OMA>
@@ -2159,10 +2159,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsZero"></om:OMS>
       </om:OMA>
@@ -2180,10 +2180,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsZero"></om:OMS>
       </om:OMA>
@@ -2201,10 +2201,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsAdditiveInverses"></om:OMS>
       </om:OMA>
@@ -2222,10 +2222,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsAdditiveInverses"></om:OMS>
       </om:OMA>
@@ -2243,10 +2243,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsScalarMultiplication"></om:OMS>
       </om:OMA>
@@ -2264,10 +2264,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alghom" name="IsOperationAlgebraHomomorphismDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsScalarMultiplication"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/alglie.omdoc b/content/http..www.gap-system.org/lib/alglie.omdoc
index ba56e891c1b426594a4e93476fb3dc49d15d9389..8dd593ff7c51d8e4b138c7ed2aa92ad5002e3ae3 100644
--- a/content/http..www.gap-system.org/lib/alglie.omdoc
+++ b/content/http..www.gap-system.org/lib/alglie.omdoc
@@ -3,7 +3,7 @@
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="category"></om:OMS></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?alglie"></import><constant name="SimpleSystem">
+     </constant><constant name="SimpleSystem">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
@@ -73,13 +73,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsFamilyElementOfFreeLieAlgebra"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsFamily"></om:OMS>
       </om:OMA>
@@ -97,13 +97,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsFamilyElementOfFreeLieAlgebra"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -133,13 +133,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsFamilyElementOfFreeLieAlgebra"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -175,13 +175,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsFamilyElementOfFreeLieAlgebra"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -234,13 +234,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsRootSystemFromLieAlgebra"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsRootSystem"></om:OMS>
       </om:OMA>
@@ -295,10 +295,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -313,10 +313,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -331,10 +331,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -352,10 +352,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -373,10 +373,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -394,10 +394,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -415,10 +415,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -436,10 +436,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -463,10 +463,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -490,10 +490,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -517,10 +517,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -544,10 +544,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -571,10 +571,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -592,10 +592,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsExtLSet"></om:OMS>
       </om:OMA>
@@ -613,10 +613,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpEProd"></om:OMS>
       </om:OMA>
@@ -634,10 +634,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpDSum"></om:OMS>
       </om:OMA>
@@ -655,10 +655,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpESum"></om:OMS>
       </om:OMA>
@@ -676,10 +676,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsTrivialLOpEOne"></om:OMS>
       </om:OMA>
@@ -697,10 +697,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnByRing"></om:OMS>
       </om:OMA>
@@ -718,10 +718,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagma"></om:OMS>
       </om:OMA>
@@ -739,10 +739,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagmaWithZero"></om:OMS>
       </om:OMA>
@@ -760,10 +760,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveGroup"></om:OMS>
       </om:OMA>
@@ -781,10 +781,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -802,10 +802,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -823,10 +823,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFreeLeftModule"></om:OMS>
       </om:OMA>
@@ -844,10 +844,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsSpaceOfUEAElements"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsHandledByNiceBasis"></om:OMS>
       </om:OMA>
@@ -1094,13 +1094,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsFptoSCAMorphism"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -1118,13 +1118,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsFptoSCAMorphism"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -1142,13 +1142,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsFptoSCAMorphism"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -1166,13 +1166,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsFptoSCAMorphism"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -1190,13 +1190,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsFptoSCAMorphism"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -1214,13 +1214,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsFptoSCAMorphism"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -1238,13 +1238,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsFptoSCAMorphism"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -1262,13 +1262,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsFptoSCAMorphism"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -1286,13 +1286,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsFptoSCAMorphism"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -1310,13 +1310,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsFptoSCAMorphism"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -1334,13 +1334,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsFptoSCAMorphism"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -1358,13 +1358,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsFptoSCAMorphism"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -1382,13 +1382,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsFptoSCAMorphism"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -1406,13 +1406,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsFptoSCAMorphism"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsAddition"></om:OMS>
       </om:OMA>
@@ -1430,13 +1430,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsFptoSCAMorphism"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsAddition"></om:OMS>
       </om:OMA>
@@ -1454,13 +1454,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsFptoSCAMorphism"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsZero"></om:OMS>
       </om:OMA>
@@ -1478,13 +1478,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsFptoSCAMorphism"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsZero"></om:OMS>
       </om:OMA>
@@ -1502,13 +1502,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsFptoSCAMorphism"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsAdditiveInverses"></om:OMS>
       </om:OMA>
@@ -1526,13 +1526,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsFptoSCAMorphism"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsAdditiveInverses"></om:OMS>
       </om:OMA>
@@ -1550,13 +1550,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsFptoSCAMorphism"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsScalarMultiplication"></om:OMS>
       </om:OMA>
@@ -1574,13 +1574,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="alglie" name="IsFptoSCAMorphism"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsScalarMultiplication"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/algrep.omdoc b/content/http..www.gap-system.org/lib/algrep.omdoc
index 02d72afcc33d5495331ecfd9c5494eef2580985c..86401ae350b876c54c53b0359df9390e0deffdb2 100644
--- a/content/http..www.gap-system.org/lib/algrep.omdoc
+++ b/content/http..www.gap-system.org/lib/algrep.omdoc
@@ -6,7 +6,7 @@
       </om:OMA></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?algrep"></import><import from="http://www.gap-system.org/lib?magma"></import><import from="http://www.gap-system.org/lib?semiring"></import><constant name="ModuleByRestriction">
+     </constant><import from="http://www.gap-system.org/lib?magma"></import><import from="http://www.gap-system.org/lib?semiring"></import><constant name="ModuleByRestriction">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
@@ -28,13 +28,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsMonomialElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -52,13 +52,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsMonomialElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -76,13 +76,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsMonomialElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -100,13 +100,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsMonomialElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -124,13 +124,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsMonomialElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -148,13 +148,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsMonomialElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -172,13 +172,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsMonomialElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -217,13 +217,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsBasisOfAlgebraModuleElementSpace"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsList"></om:OMS>
       </om:OMA>
@@ -241,13 +241,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsBasisOfAlgebraModuleElementSpace"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDenseList"></om:OMS>
       </om:OMA>
@@ -265,13 +265,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsBasisOfAlgebraModuleElementSpace"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsHomogeneousList"></om:OMS>
       </om:OMA>
@@ -289,13 +289,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsBasisOfAlgebraModuleElementSpace"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -313,13 +313,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsBasisOfAlgebraModuleElementSpace"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -337,13 +337,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsBasisOfAlgebraModuleElementSpace"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -361,13 +361,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsBasisOfAlgebraModuleElementSpace"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsBasis"></om:OMS>
       </om:OMA>
@@ -406,13 +406,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsWedgeElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -430,13 +430,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsWedgeElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -454,13 +454,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsWedgeElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -478,13 +478,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsWedgeElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -502,13 +502,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsWedgeElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -526,13 +526,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsWedgeElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -550,13 +550,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsWedgeElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -574,13 +574,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsWedgeElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsMonomialElement"></om:OMS>
       </om:OMA>
@@ -603,10 +603,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -621,10 +621,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -639,10 +639,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -660,10 +660,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -681,10 +681,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -702,10 +702,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -723,10 +723,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -744,10 +744,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -771,10 +771,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -798,10 +798,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -825,10 +825,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -852,10 +852,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -879,10 +879,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -900,10 +900,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsExtLSet"></om:OMS>
       </om:OMA>
@@ -921,10 +921,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpEProd"></om:OMS>
       </om:OMA>
@@ -942,10 +942,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpDSum"></om:OMS>
       </om:OMA>
@@ -963,10 +963,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpESum"></om:OMS>
       </om:OMA>
@@ -984,10 +984,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsTrivialLOpEOne"></om:OMS>
       </om:OMA>
@@ -1005,10 +1005,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnByRing"></om:OMS>
       </om:OMA>
@@ -1026,10 +1026,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagma"></om:OMS>
       </om:OMA>
@@ -1047,10 +1047,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagmaWithZero"></om:OMS>
       </om:OMA>
@@ -1068,10 +1068,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveGroup"></om:OMS>
       </om:OMA>
@@ -1089,10 +1089,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -1110,10 +1110,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -1131,10 +1131,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFreeLeftModule"></om:OMS>
       </om:OMA>
@@ -1152,10 +1152,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsHandledByNiceBasis"></om:OMS>
       </om:OMA>
@@ -1210,10 +1210,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsBasisOfMonomialSpaceRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsBasisOfMonomialSpaceRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1233,13 +1233,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsSparseRowSpaceElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -1257,13 +1257,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsSparseRowSpaceElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -1281,13 +1281,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsSparseRowSpaceElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -1305,13 +1305,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsSparseRowSpaceElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -1329,13 +1329,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsSparseRowSpaceElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -1353,13 +1353,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsSparseRowSpaceElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -1377,13 +1377,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsSparseRowSpaceElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -1422,10 +1422,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsMutableBasisViaUnderlyingMutableBasisRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsMutableBasisViaUnderlyingMutableBasisRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1493,13 +1493,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsAlgebraModuleElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -1517,13 +1517,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsAlgebraModuleElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -1541,13 +1541,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsAlgebraModuleElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -1565,13 +1565,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsAlgebraModuleElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -1589,13 +1589,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsAlgebraModuleElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -1613,13 +1613,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsAlgebraModuleElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -1637,13 +1637,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsAlgebraModuleElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -1666,13 +1666,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsLeftAlgebraModuleElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -1690,13 +1690,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsLeftAlgebraModuleElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -1714,13 +1714,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsLeftAlgebraModuleElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -1738,13 +1738,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsLeftAlgebraModuleElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -1762,13 +1762,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsLeftAlgebraModuleElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -1786,13 +1786,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsLeftAlgebraModuleElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -1810,13 +1810,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsLeftAlgebraModuleElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -1834,13 +1834,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsLeftAlgebraModuleElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsAlgebraModuleElement"></om:OMS>
       </om:OMA>
@@ -1887,10 +1887,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsMonomialElementRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsMonomialElementRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1910,10 +1910,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsBasisOfSparseRowSpaceRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsBasisOfSparseRowSpaceRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1989,13 +1989,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -2013,13 +2013,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -2037,13 +2037,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -2061,13 +2061,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -2085,13 +2085,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -2109,13 +2109,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -2133,13 +2133,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsDirectSumElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -2178,13 +2178,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsRightAlgebraModuleElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -2202,13 +2202,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsRightAlgebraModuleElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -2226,13 +2226,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsRightAlgebraModuleElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -2250,13 +2250,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsRightAlgebraModuleElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -2274,13 +2274,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsRightAlgebraModuleElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -2298,13 +2298,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsRightAlgebraModuleElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -2322,13 +2322,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsRightAlgebraModuleElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -2346,13 +2346,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsRightAlgebraModuleElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsAlgebraModuleElement"></om:OMS>
       </om:OMA>
@@ -2375,13 +2375,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsSymmetricPowerElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -2399,13 +2399,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsSymmetricPowerElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -2423,13 +2423,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsSymmetricPowerElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -2447,13 +2447,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsSymmetricPowerElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -2471,13 +2471,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsSymmetricPowerElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -2495,13 +2495,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsSymmetricPowerElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -2519,13 +2519,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsSymmetricPowerElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -2543,13 +2543,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsSymmetricPowerElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsMonomialElement"></om:OMS>
       </om:OMA>
@@ -2572,13 +2572,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsTensorElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -2596,13 +2596,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsTensorElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -2620,13 +2620,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsTensorElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -2644,13 +2644,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsTensorElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -2668,13 +2668,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsTensorElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -2692,13 +2692,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsTensorElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -2716,13 +2716,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsTensorElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -2740,13 +2740,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsTensorElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algrep" name="IsMonomialElement"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/algsc.omdoc b/content/http..www.gap-system.org/lib/algsc.omdoc
index 0419867a20678aa792d2eafdca248e5057e84074..d1e145f2eb08c0ef6db69d618772b906b7b3ae5a 100644
--- a/content/http..www.gap-system.org/lib/algsc.omdoc
+++ b/content/http..www.gap-system.org/lib/algsc.omdoc
@@ -20,10 +20,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsDenseCoeffVectorRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsDenseCoeffVectorRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -43,13 +43,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -67,13 +67,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -91,13 +91,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -115,13 +115,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -139,13 +139,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -163,13 +163,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -187,13 +187,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -211,13 +211,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -235,13 +235,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -259,13 +259,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -288,13 +288,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsFamilyOverFullCoefficientsFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsFamily"></om:OMS>
       </om:OMA>
@@ -317,10 +317,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -335,10 +335,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -353,10 +353,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -374,10 +374,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -395,10 +395,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -416,10 +416,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -437,10 +437,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -458,10 +458,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -485,10 +485,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -512,10 +512,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -539,10 +539,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -566,10 +566,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -593,10 +593,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -614,10 +614,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsExtLSet"></om:OMS>
       </om:OMA>
@@ -635,10 +635,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpEProd"></om:OMS>
       </om:OMA>
@@ -656,10 +656,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpDSum"></om:OMS>
       </om:OMA>
@@ -677,10 +677,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpESum"></om:OMS>
       </om:OMA>
@@ -698,10 +698,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsTrivialLOpEOne"></om:OMS>
       </om:OMA>
@@ -719,10 +719,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnByRing"></om:OMS>
       </om:OMA>
@@ -740,10 +740,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagma"></om:OMS>
       </om:OMA>
@@ -761,10 +761,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagmaWithZero"></om:OMS>
       </om:OMA>
@@ -782,10 +782,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveGroup"></om:OMS>
       </om:OMA>
@@ -803,10 +803,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -824,10 +824,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -845,10 +845,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFreeLeftModule"></om:OMS>
       </om:OMA>
@@ -866,10 +866,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="algsc" name="IsSCAlgebraObjSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsHandledByNiceBasis"></om:OMS>
       </om:OMA>
@@ -878,7 +878,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?magma"></import><import from="http://www.gap-system.org/lib?semiring"></import><import from="http://www.gap-system.org/lib?algsc"></import><constant name="IsFullSCAlgebra">
+     </constant><import from="http://www.gap-system.org/lib?magma"></import><import from="http://www.gap-system.org/lib?semiring"></import><constant name="IsFullSCAlgebra">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
diff --git a/content/http..www.gap-system.org/lib/arith.omdoc b/content/http..www.gap-system.org/lib/arith.omdoc
index 05b3b0085a3503cd63962d50cc736e4bfda539c3..b618d6f4bc969b8861ba924424d9b06740d4417f 100644
--- a/content/http..www.gap-system.org/lib/arith.omdoc
+++ b/content/http..www.gap-system.org/lib/arith.omdoc
@@ -3,7 +3,7 @@
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="category"></om:OMS></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?arith"></import><constant name="IsNearAdditiveElement">
+     </constant><constant name="IsNearAdditiveElement">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="category"></om:OMS></om:OMOBJ></type>
        
@@ -17,13 +17,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -46,13 +46,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -70,13 +70,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -99,13 +99,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -123,13 +123,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -147,13 +147,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -186,13 +186,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -210,13 +210,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -239,13 +239,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -263,13 +263,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -292,13 +292,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -316,13 +316,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -340,13 +340,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -369,13 +369,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -393,13 +393,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -417,13 +417,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -441,13 +441,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -470,13 +470,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZDFRE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -494,13 +494,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZDFRE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -518,13 +518,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZDFRE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -542,13 +542,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZDFRE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -566,13 +566,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZDFRE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -590,13 +590,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZDFRE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -614,13 +614,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZDFRE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -638,13 +638,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZDFRE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -662,13 +662,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZDFRE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -686,13 +686,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZDFRE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -715,13 +715,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -739,13 +739,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -763,13 +763,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -792,13 +792,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditivelyCommutativeElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -816,13 +816,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditivelyCommutativeElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -840,13 +840,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditivelyCommutativeElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -869,13 +869,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsCommutativeElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -893,13 +893,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsCommutativeElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -917,13 +917,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsCommutativeElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -946,13 +946,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsJacobianElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -970,13 +970,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsJacobianElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -994,13 +994,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsJacobianElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -1018,13 +1018,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsJacobianElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -1042,13 +1042,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsJacobianElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -1066,13 +1066,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsJacobianElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -1090,13 +1090,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsJacobianElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -1114,13 +1114,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsJacobianElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -1143,13 +1143,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsRestrictedJacobianElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -1167,13 +1167,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsRestrictedJacobianElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -1191,13 +1191,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsRestrictedJacobianElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -1215,13 +1215,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsRestrictedJacobianElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -1239,13 +1239,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsRestrictedJacobianElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -1263,13 +1263,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsRestrictedJacobianElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -1287,13 +1287,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsRestrictedJacobianElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -1311,13 +1311,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsRestrictedJacobianElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -1335,13 +1335,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsRestrictedJacobianElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsJacobianElement"></om:OMS>
       </om:OMA>
@@ -1364,13 +1364,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsGeneralizedRowVector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsList"></om:OMS>
       </om:OMA>
@@ -1388,13 +1388,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsGeneralizedRowVector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -1412,13 +1412,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsGeneralizedRowVector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -1436,13 +1436,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsGeneralizedRowVector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -1460,13 +1460,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsGeneralizedRowVector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -1484,13 +1484,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsGeneralizedRowVector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -1508,13 +1508,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsGeneralizedRowVector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -1680,13 +1680,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsFiniteOrderElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -1704,13 +1704,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsFiniteOrderElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -1728,13 +1728,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsFiniteOrderElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -1752,13 +1752,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsFiniteOrderElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -1776,13 +1776,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsFiniteOrderElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -1931,13 +1931,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeGeneralizedRowVector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsList"></om:OMS>
       </om:OMA>
@@ -1955,13 +1955,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeGeneralizedRowVector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -1979,13 +1979,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeGeneralizedRowVector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -2003,13 +2003,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeGeneralizedRowVector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -2027,13 +2027,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeGeneralizedRowVector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -2051,13 +2051,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeGeneralizedRowVector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -2075,13 +2075,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeGeneralizedRowVector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -2099,13 +2099,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeGeneralizedRowVector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsGeneralizedRowVector"></om:OMS>
       </om:OMA>
@@ -2218,13 +2218,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsOrdinaryMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsList"></om:OMS>
       </om:OMA>
@@ -2242,13 +2242,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsOrdinaryMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDenseList"></om:OMS>
       </om:OMA>
@@ -2266,13 +2266,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsOrdinaryMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsHomogeneousList"></om:OMS>
       </om:OMA>
@@ -2290,13 +2290,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsOrdinaryMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsTable"></om:OMS>
       </om:OMA>
@@ -2314,13 +2314,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsOrdinaryMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -2338,13 +2338,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsOrdinaryMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -2362,13 +2362,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsOrdinaryMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -2386,13 +2386,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsOrdinaryMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2416,13 +2416,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsOrdinaryMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2452,13 +2452,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsOrdinaryMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -2476,13 +2476,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsOrdinaryMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2506,13 +2506,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsOrdinaryMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2542,13 +2542,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsOrdinaryMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -2566,13 +2566,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsOrdinaryMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2596,13 +2596,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsOrdinaryMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2632,13 +2632,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsOrdinaryMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -2656,13 +2656,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsOrdinaryMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2686,13 +2686,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsOrdinaryMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2722,13 +2722,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsOrdinaryMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -2746,13 +2746,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsOrdinaryMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2776,13 +2776,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsOrdinaryMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2812,13 +2812,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsOrdinaryMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -2836,13 +2836,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsOrdinaryMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2866,13 +2866,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsOrdinaryMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2902,13 +2902,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsOrdinaryMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -2926,13 +2926,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsOrdinaryMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2956,13 +2956,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsOrdinaryMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2992,13 +2992,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsOrdinaryMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -3016,13 +3016,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsOrdinaryMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -3052,13 +3052,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsOrdinaryMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsGeneralizedRowVector"></om:OMS>
       </om:OMA>
@@ -3076,13 +3076,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsOrdinaryMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeGeneralizedRowVector"></om:OMS>
       </om:OMA>
@@ -3269,13 +3269,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZeroSquaredElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -3293,13 +3293,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZeroSquaredElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -3317,13 +3317,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZeroSquaredElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -3341,13 +3341,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZeroSquaredElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -3365,13 +3365,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZeroSquaredElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -3389,13 +3389,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZeroSquaredElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -3413,13 +3413,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZeroSquaredElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -3437,13 +3437,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZeroSquaredElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -3946,13 +3946,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearRingElementFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsFamily"></om:OMS>
       </om:OMA>
@@ -3970,13 +3970,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearRingElementFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -4966,13 +4966,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsLieMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsList"></om:OMS>
       </om:OMA>
@@ -4990,13 +4990,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsLieMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDenseList"></om:OMS>
       </om:OMA>
@@ -5014,13 +5014,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsLieMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsHomogeneousList"></om:OMS>
       </om:OMA>
@@ -5038,13 +5038,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsLieMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsTable"></om:OMS>
       </om:OMA>
@@ -5062,13 +5062,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsLieMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -5086,13 +5086,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsLieMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -5110,13 +5110,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsLieMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -5134,13 +5134,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsLieMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -5164,13 +5164,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsLieMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -5200,13 +5200,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsLieMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -5224,13 +5224,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsLieMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -5254,13 +5254,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsLieMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -5290,13 +5290,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsLieMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -5314,13 +5314,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsLieMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -5344,13 +5344,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsLieMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -5380,13 +5380,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsLieMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -5404,13 +5404,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsLieMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -5434,13 +5434,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsLieMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -5470,13 +5470,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsLieMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -5494,13 +5494,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsLieMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -5524,13 +5524,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsLieMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -5560,13 +5560,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsLieMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -5584,13 +5584,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsLieMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -5614,13 +5614,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsLieMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -5650,13 +5650,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsLieMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -5674,13 +5674,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsLieMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -5704,13 +5704,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsLieMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -5740,13 +5740,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsLieMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -5764,13 +5764,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsLieMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -5800,13 +5800,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsLieMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsGeneralizedRowVector"></om:OMS>
       </om:OMA>
@@ -5885,13 +5885,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsRingElementFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsFamily"></om:OMS>
       </om:OMA>
@@ -5909,13 +5909,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsRingElementFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -5945,13 +5945,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsRingElementFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -6354,13 +6354,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMatrixCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -6378,13 +6378,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMatrixCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -6402,13 +6402,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMatrixCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -6426,13 +6426,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMatrixCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -6456,13 +6456,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMatrixCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -6492,13 +6492,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMatrixCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -6522,13 +6522,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMatrixCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -6558,13 +6558,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMatrixCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -6600,13 +6600,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMatrixCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -6630,13 +6630,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMatrixCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -6666,13 +6666,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMatrixCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -6708,13 +6708,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMatrixCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -6738,13 +6738,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMatrixCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -6774,13 +6774,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMatrixCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -6816,13 +6816,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMatrixCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -6846,13 +6846,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMatrixCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -6882,13 +6882,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMatrixCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -6924,13 +6924,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMatrixCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -6948,13 +6948,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMatrixCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -6978,13 +6978,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMatrixCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -7014,13 +7014,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMatrixCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -7038,13 +7038,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMatrixCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -7068,13 +7068,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMatrixCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -7104,13 +7104,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMatrixCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -7134,13 +7134,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMatrixCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -7176,13 +7176,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMatrixCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -7763,10 +7763,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElementAsMultiplicativeElementRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElementAsMultiplicativeElementRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -7781,10 +7781,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElementAsMultiplicativeElementRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElementAsMultiplicativeElementRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -7802,10 +7802,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElementAsMultiplicativeElementRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElementAsMultiplicativeElementRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -7823,10 +7823,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElementAsMultiplicativeElementRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElementAsMultiplicativeElementRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/basis.omdoc b/content/http..www.gap-system.org/lib/basis.omdoc
index a7741ff05a408c405a98e1f08c1cdf341d5c3724..1b9ffb440a72d9a133fcf919c4c97c8a809e6f0e 100644
--- a/content/http..www.gap-system.org/lib/basis.omdoc
+++ b/content/http..www.gap-system.org/lib/basis.omdoc
@@ -20,13 +20,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsBasis"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsList"></om:OMS>
       </om:OMA>
@@ -44,13 +44,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsBasis"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDenseList"></om:OMS>
       </om:OMA>
@@ -68,13 +68,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsBasis"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsHomogeneousList"></om:OMS>
       </om:OMA>
@@ -92,13 +92,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsBasis"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -116,13 +116,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsBasis"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -140,13 +140,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsBasis"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -155,7 +155,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?basis"></import><constant name="BasisVectors">
+     </constant><constant name="BasisVectors">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
@@ -193,13 +193,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsBasisByNiceBasis"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsList"></om:OMS>
       </om:OMA>
@@ -217,13 +217,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsBasisByNiceBasis"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDenseList"></om:OMS>
       </om:OMA>
@@ -241,13 +241,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsBasisByNiceBasis"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsHomogeneousList"></om:OMS>
       </om:OMA>
@@ -265,13 +265,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsBasisByNiceBasis"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -289,13 +289,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsBasisByNiceBasis"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsFinite"></om:OMS>
       </om:OMA>
@@ -313,13 +313,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsBasisByNiceBasis"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsFinite"></om:OMS>
       </om:OMA>
@@ -337,13 +337,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsBasisByNiceBasis"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsSmallList"></om:OMS>
       </om:OMA>
@@ -361,13 +361,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsBasisByNiceBasis"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsSmallList"></om:OMS>
       </om:OMA>
@@ -385,13 +385,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsBasisByNiceBasis"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -409,13 +409,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsBasisByNiceBasis"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -433,13 +433,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsBasisByNiceBasis"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsBasis"></om:OMS>
       </om:OMA>
@@ -494,10 +494,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsBasisWithReplacedLeftModuleRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsBasisWithReplacedLeftModuleRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -512,10 +512,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsBasisWithReplacedLeftModuleRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsBasisWithReplacedLeftModuleRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -535,10 +535,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -553,10 +553,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -571,10 +571,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -592,10 +592,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -613,10 +613,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -634,10 +634,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -655,10 +655,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -676,10 +676,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -703,10 +703,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -730,10 +730,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -757,10 +757,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -784,10 +784,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -811,10 +811,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -832,10 +832,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsExtLSet"></om:OMS>
       </om:OMA>
@@ -853,10 +853,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpEProd"></om:OMS>
       </om:OMA>
@@ -874,10 +874,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpDSum"></om:OMS>
       </om:OMA>
@@ -895,10 +895,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpESum"></om:OMS>
       </om:OMA>
@@ -916,10 +916,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsTrivialLOpEOne"></om:OMS>
       </om:OMA>
@@ -937,10 +937,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnByRing"></om:OMS>
       </om:OMA>
@@ -958,10 +958,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagma"></om:OMS>
       </om:OMA>
@@ -979,10 +979,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagmaWithZero"></om:OMS>
       </om:OMA>
@@ -1000,10 +1000,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveGroup"></om:OMS>
       </om:OMA>
@@ -1021,10 +1021,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -1042,10 +1042,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -1063,10 +1063,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFreeLeftModule"></om:OMS>
       </om:OMA>
@@ -1084,10 +1084,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsGenericFiniteSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsHandledByNiceBasis"></om:OMS>
       </om:OMA>
@@ -1126,10 +1126,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsRelativeBasisDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsRelativeBasisDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1144,10 +1144,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsRelativeBasisDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsRelativeBasisDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1243,10 +1243,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1261,10 +1261,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1279,10 +1279,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -1300,10 +1300,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -1321,10 +1321,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1342,10 +1342,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1363,10 +1363,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -1384,10 +1384,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1411,10 +1411,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1438,10 +1438,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1465,10 +1465,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1492,10 +1492,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1519,10 +1519,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -1540,10 +1540,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsExtLSet"></om:OMS>
       </om:OMA>
@@ -1561,10 +1561,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpEProd"></om:OMS>
       </om:OMA>
@@ -1582,10 +1582,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpDSum"></om:OMS>
       </om:OMA>
@@ -1603,10 +1603,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpESum"></om:OMS>
       </om:OMA>
@@ -1624,10 +1624,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsTrivialLOpEOne"></om:OMS>
       </om:OMA>
@@ -1645,10 +1645,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnByRing"></om:OMS>
       </om:OMA>
@@ -1666,10 +1666,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagma"></om:OMS>
       </om:OMA>
@@ -1687,10 +1687,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagmaWithZero"></om:OMS>
       </om:OMA>
@@ -1708,10 +1708,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveGroup"></om:OMS>
       </om:OMA>
@@ -1729,10 +1729,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -1750,10 +1750,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -1771,10 +1771,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFreeLeftModule"></om:OMS>
       </om:OMA>
@@ -1792,10 +1792,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsSpaceOfRationalFunctions"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsHandledByNiceBasis"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/basismut.omdoc b/content/http..www.gap-system.org/lib/basismut.omdoc
index b8b0675e0a5459217568e41b810774f5df083b52..ec8f882f88db16bf2de95743839ca1cb693761b0 100644
--- a/content/http..www.gap-system.org/lib/basismut.omdoc
+++ b/content/http..www.gap-system.org/lib/basismut.omdoc
@@ -3,7 +3,7 @@
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="category"></om:OMS></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?basismut"></import><import from="http://www.gap-system.org/lib?arith"></import><constant name="IsContainedInSpan">
+     </constant><import from="http://www.gap-system.org/lib?arith"></import><constant name="IsContainedInSpan">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
@@ -41,10 +41,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basismut" name="IsMutableBasisViaNiceMutableBasisRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basismut" name="IsMutableBasisViaNiceMutableBasisRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -80,10 +80,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basismut" name="IsMutableBasisByImmutableBasisRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="basismut" name="IsMutableBasisByImmutableBasisRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/clas.omdoc b/content/http..www.gap-system.org/lib/clas.omdoc
index 817b5f4b83fef85eafac7680babee194ef170dac..b045eb69d9040448aa881a3484507f2320dad306 100644
--- a/content/http..www.gap-system.org/lib/clas.omdoc
+++ b/content/http..www.gap-system.org/lib/clas.omdoc
@@ -12,10 +12,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsRationalClassGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsRationalClassGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -30,10 +30,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsRationalClassGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsRationalClassGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -48,10 +48,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsRationalClassGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsRationalClassGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -69,10 +69,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsRationalClassGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsRationalClassGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -90,10 +90,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsRationalClassGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsRationalClassGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsFinite"></om:OMS>
       </om:OMA>
@@ -111,10 +111,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsRationalClassGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsRationalClassGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsFinite"></om:OMS>
       </om:OMA>
@@ -132,10 +132,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsRationalClassGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsRationalClassGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -153,10 +153,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsRationalClassGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsRationalClassGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -174,10 +174,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsRationalClassGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsRationalClassGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -195,10 +195,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsRationalClassGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsRationalClassGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSet"></om:OMS>
       </om:OMA>
@@ -207,7 +207,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?clas"></import><constant name="DecomposedRationalClass">
+     </constant><constant name="DecomposedRationalClass">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
@@ -229,10 +229,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsConjugacyClassGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsConjugacyClassGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -247,10 +247,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsConjugacyClassGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsConjugacyClassGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -265,10 +265,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsConjugacyClassGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsConjugacyClassGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -286,10 +286,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsConjugacyClassGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsConjugacyClassGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -307,10 +307,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsConjugacyClassGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsConjugacyClassGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -328,10 +328,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsConjugacyClassGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsConjugacyClassGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -349,10 +349,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsConjugacyClassGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsConjugacyClassGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -370,10 +370,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsConjugacyClassGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsConjugacyClassGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSet"></om:OMS>
       </om:OMA>
@@ -391,10 +391,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsConjugacyClassGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsConjugacyClassGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSubset"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSubset"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -409,10 +409,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsConjugacyClassGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsConjugacyClassGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalOrbit"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalOrbit"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -432,10 +432,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsRationalClassPermGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsRationalClassPermGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -450,10 +450,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsRationalClassPermGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsRationalClassPermGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -468,10 +468,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsRationalClassPermGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsRationalClassPermGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -489,10 +489,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsRationalClassPermGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsRationalClassPermGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -510,10 +510,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsRationalClassPermGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsRationalClassPermGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsFinite"></om:OMS>
       </om:OMA>
@@ -531,10 +531,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsRationalClassPermGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsRationalClassPermGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsFinite"></om:OMS>
       </om:OMA>
@@ -552,10 +552,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsRationalClassPermGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsRationalClassPermGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -573,10 +573,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsRationalClassPermGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsRationalClassPermGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -594,10 +594,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsRationalClassPermGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsRationalClassPermGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -615,10 +615,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsRationalClassPermGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsRationalClassPermGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSet"></om:OMS>
       </om:OMA>
@@ -636,10 +636,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsRationalClassPermGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsRationalClassPermGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsRationalClassGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsRationalClassGroupRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -659,10 +659,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsExternalOrbitByStabilizerRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsExternalOrbitByStabilizerRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -677,10 +677,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsExternalOrbitByStabilizerRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsExternalOrbitByStabilizerRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -695,10 +695,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsExternalOrbitByStabilizerRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsExternalOrbitByStabilizerRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -716,10 +716,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsExternalOrbitByStabilizerRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsExternalOrbitByStabilizerRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -737,10 +737,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsExternalOrbitByStabilizerRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsExternalOrbitByStabilizerRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -758,10 +758,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsExternalOrbitByStabilizerRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsExternalOrbitByStabilizerRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -779,10 +779,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsExternalOrbitByStabilizerRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsExternalOrbitByStabilizerRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -800,10 +800,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsExternalOrbitByStabilizerRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsExternalOrbitByStabilizerRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSet"></om:OMS>
       </om:OMA>
@@ -821,10 +821,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsExternalOrbitByStabilizerRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsExternalOrbitByStabilizerRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSubset"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSubset"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -839,10 +839,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsExternalOrbitByStabilizerRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsExternalOrbitByStabilizerRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalOrbit"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalOrbit"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -878,10 +878,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsConjugacyClassPermGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsConjugacyClassPermGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -896,10 +896,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsConjugacyClassPermGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsConjugacyClassPermGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -914,10 +914,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsConjugacyClassPermGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsConjugacyClassPermGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -935,10 +935,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsConjugacyClassPermGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsConjugacyClassPermGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -956,10 +956,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsConjugacyClassPermGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsConjugacyClassPermGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -977,10 +977,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsConjugacyClassPermGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsConjugacyClassPermGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -998,10 +998,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsConjugacyClassPermGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsConjugacyClassPermGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -1019,10 +1019,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsConjugacyClassPermGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsConjugacyClassPermGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSet"></om:OMS>
       </om:OMA>
@@ -1040,10 +1040,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsConjugacyClassPermGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsConjugacyClassPermGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSubset"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSubset"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1058,10 +1058,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsConjugacyClassPermGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsConjugacyClassPermGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalOrbit"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalOrbit"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1076,10 +1076,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsConjugacyClassPermGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsConjugacyClassPermGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsExternalOrbitByStabilizerRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsExternalOrbitByStabilizerRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1094,10 +1094,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsConjugacyClassPermGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsConjugacyClassPermGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsConjugacyClassGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsConjugacyClassGroupRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/coll.omdoc b/content/http..www.gap-system.org/lib/coll.omdoc
index 337164f7536e1d4ac71e579d8b6c806c3af60618..b7a4847aaf403340da5da0a9f7bd6f6ae719d85b 100644
--- a/content/http..www.gap-system.org/lib/coll.omdoc
+++ b/content/http..www.gap-system.org/lib/coll.omdoc
@@ -3,7 +3,7 @@
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="category"></om:OMS></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?coll"></import><constant name="IsCollection">
+     </constant><constant name="IsCollection">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="category"></om:OMS></om:OMOBJ></type>
        
@@ -17,13 +17,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -192,10 +192,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsIteratorByFunctionsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsIteratorByFunctionsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -303,10 +303,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsEnumeratorByFunctionsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsEnumeratorByFunctionsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/csetgrp.omdoc b/content/http..www.gap-system.org/lib/csetgrp.omdoc
index ebb34bff8646dbaea9fec5d7098a64231e003eed..f8049aaeabc4f70db6dc577d42fe0d5b3f445c1e 100644
--- a/content/http..www.gap-system.org/lib/csetgrp.omdoc
+++ b/content/http..www.gap-system.org/lib/csetgrp.omdoc
@@ -20,10 +20,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightTransversalViaCosetsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightTransversalViaCosetsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -38,10 +38,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightTransversalViaCosetsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightTransversalViaCosetsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -56,10 +56,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightTransversalViaCosetsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightTransversalViaCosetsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -77,10 +77,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightTransversalViaCosetsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightTransversalViaCosetsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -98,10 +98,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightTransversalViaCosetsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightTransversalViaCosetsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grp" name="IsRightTransversal"></om:OMS>
       </om:OMA>
@@ -119,10 +119,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightTransversalViaCosetsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightTransversalViaCosetsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grp" name="IsRightTransversalRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grp" name="IsRightTransversalRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -142,13 +142,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsDoubleCoset"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -166,13 +166,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsDoubleCoset"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -190,13 +190,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsDoubleCoset"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -214,13 +214,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsDoubleCoset"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -238,13 +238,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsDoubleCoset"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -262,13 +262,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsDoubleCoset"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsExtLSet"></om:OMS>
       </om:OMA>
@@ -286,13 +286,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsDoubleCoset"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsExtRSet"></om:OMS>
       </om:OMA>
@@ -301,7 +301,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?csetgrp"></import><constant name="LeftActingGroup">
+     </constant><constant name="LeftActingGroup">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
@@ -331,13 +331,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightCoset"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -352,13 +352,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightCoset"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -373,13 +373,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightCoset"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -397,13 +397,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightCoset"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -421,13 +421,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightCoset"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -445,13 +445,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightCoset"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -469,13 +469,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightCoset"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -493,13 +493,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightCoset"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -517,13 +517,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightCoset"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -541,13 +541,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightCoset"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -565,13 +565,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightCoset"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -589,13 +589,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightCoset"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -613,13 +613,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightCoset"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSet"></om:OMS>
       </om:OMA>
@@ -637,13 +637,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightCoset"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSubset"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSubset"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -658,13 +658,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightCoset"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalOrbit"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalOrbit"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -684,10 +684,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightCosetDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightCosetDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -702,10 +702,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightCosetDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightCosetDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -720,10 +720,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightCosetDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightCosetDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -741,10 +741,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightCosetDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightCosetDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -762,10 +762,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightCosetDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightCosetDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -783,10 +783,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightCosetDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightCosetDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -804,10 +804,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightCosetDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightCosetDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -825,10 +825,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightCosetDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightCosetDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -846,10 +846,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightCosetDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightCosetDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -867,10 +867,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightCosetDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightCosetDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -888,10 +888,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightCosetDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightCosetDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -909,10 +909,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightCosetDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightCosetDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -930,10 +930,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightCosetDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightCosetDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSet"></om:OMS>
       </om:OMA>
@@ -951,10 +951,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightCosetDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightCosetDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSubset"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSubset"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -969,10 +969,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightCosetDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightCosetDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalOrbit"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalOrbit"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -987,10 +987,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightCosetDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightCosetDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsRightCoset"></om:OMS>
       </om:OMA>
@@ -1053,10 +1053,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsDoubleCosetDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsDoubleCosetDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1071,10 +1071,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsDoubleCosetDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsDoubleCosetDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1089,10 +1089,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsDoubleCosetDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsDoubleCosetDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -1110,10 +1110,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsDoubleCosetDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsDoubleCosetDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -1131,10 +1131,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsDoubleCosetDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsDoubleCosetDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1152,10 +1152,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsDoubleCosetDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsDoubleCosetDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1173,10 +1173,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsDoubleCosetDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsDoubleCosetDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -1194,10 +1194,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsDoubleCosetDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsDoubleCosetDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsExtLSet"></om:OMS>
       </om:OMA>
@@ -1215,10 +1215,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsDoubleCosetDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsDoubleCosetDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsExtRSet"></om:OMS>
       </om:OMA>
@@ -1236,10 +1236,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsDoubleCosetDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsDoubleCosetDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsDoubleCoset"></om:OMS>
       </om:OMA>
@@ -1278,10 +1278,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsFactoredTransversalRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsFactoredTransversalRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1296,10 +1296,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsFactoredTransversalRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsFactoredTransversalRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1314,10 +1314,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsFactoredTransversalRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsFactoredTransversalRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -1335,10 +1335,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsFactoredTransversalRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsFactoredTransversalRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -1356,10 +1356,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsFactoredTransversalRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsFactoredTransversalRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grp" name="IsRightTransversal"></om:OMS>
       </om:OMA>
@@ -1377,10 +1377,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsFactoredTransversalRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetgrp" name="IsFactoredTransversalRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grp" name="IsRightTransversalRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grp" name="IsRightTransversalRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/csetpc.omdoc b/content/http..www.gap-system.org/lib/csetpc.omdoc
index 815112e761c3f85b593bb3f5076e9e7f603a064c..7498372244d52c93f02a3fa9beeee7638e9d9edc 100644
--- a/content/http..www.gap-system.org/lib/csetpc.omdoc
+++ b/content/http..www.gap-system.org/lib/csetpc.omdoc
@@ -12,10 +12,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetpc" name="IsRightTransversalPcGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetpc" name="IsRightTransversalPcGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -30,10 +30,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetpc" name="IsRightTransversalPcGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetpc" name="IsRightTransversalPcGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -48,10 +48,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetpc" name="IsRightTransversalPcGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetpc" name="IsRightTransversalPcGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -69,10 +69,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetpc" name="IsRightTransversalPcGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetpc" name="IsRightTransversalPcGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -90,10 +90,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetpc" name="IsRightTransversalPcGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetpc" name="IsRightTransversalPcGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grp" name="IsRightTransversal"></om:OMS>
       </om:OMA>
@@ -111,10 +111,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetpc" name="IsRightTransversalPcGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetpc" name="IsRightTransversalPcGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grp" name="IsRightTransversalRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grp" name="IsRightTransversalRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/csetperm.omdoc b/content/http..www.gap-system.org/lib/csetperm.omdoc
index a9e2998302dd96b2809a4b3643c80924959d298d..a6a870bf96f33095128c75e1ed36d5b4fa7ba1cf 100644
--- a/content/http..www.gap-system.org/lib/csetperm.omdoc
+++ b/content/http..www.gap-system.org/lib/csetperm.omdoc
@@ -12,10 +12,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetperm" name="IsRightTransversalPermGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetperm" name="IsRightTransversalPermGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -30,10 +30,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetperm" name="IsRightTransversalPermGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetperm" name="IsRightTransversalPermGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -48,10 +48,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetperm" name="IsRightTransversalPermGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetperm" name="IsRightTransversalPermGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -69,10 +69,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetperm" name="IsRightTransversalPermGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetperm" name="IsRightTransversalPermGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -90,10 +90,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetperm" name="IsRightTransversalPermGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetperm" name="IsRightTransversalPermGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grp" name="IsRightTransversal"></om:OMS>
       </om:OMA>
@@ -111,10 +111,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetperm" name="IsRightTransversalPermGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="csetperm" name="IsRightTransversalPermGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grp" name="IsRightTransversalRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grp" name="IsRightTransversalRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/ctbl.omdoc b/content/http..www.gap-system.org/lib/ctbl.omdoc
index 3c951bd9737a3d7e9087288392d9ff01254660d4..62e5248cc691213e416e12c540a1de4776279b23 100644
--- a/content/http..www.gap-system.org/lib/ctbl.omdoc
+++ b/content/http..www.gap-system.org/lib/ctbl.omdoc
@@ -3,7 +3,7 @@
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="category"></om:OMS></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?ctbl"></import><constant name="IsCharacterTable">
+     </constant><constant name="IsCharacterTable">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="category"></om:OMS></om:OMOBJ></type>
        
@@ -17,13 +17,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ctbl" name="IsCharacterTable"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ctbl" name="IsNearlyCharacterTable"></om:OMS>
       </om:OMA>
@@ -46,13 +46,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ctbl" name="IsOrdinaryTable"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ctbl" name="IsNearlyCharacterTable"></om:OMS>
       </om:OMA>
@@ -70,13 +70,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ctbl" name="IsOrdinaryTable"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ctbl" name="IsCharacterTable"></om:OMS>
       </om:OMA>
@@ -123,13 +123,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ctbl" name="IsCharacterTableInProgress"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ctbl" name="IsNearlyCharacterTable"></om:OMS>
       </om:OMA>
@@ -200,10 +200,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctbl" name="IsGenericCharacterTableRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctbl" name="IsGenericCharacterTableRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ctbl" name="IsNearlyCharacterTable"></om:OMS>
       </om:OMA>
@@ -474,13 +474,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ctbl" name="IsBrauerTable"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ctbl" name="IsNearlyCharacterTable"></om:OMS>
       </om:OMA>
@@ -498,13 +498,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ctbl" name="IsBrauerTable"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ctbl" name="IsCharacterTable"></om:OMS>
       </om:OMA>
@@ -695,10 +695,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctbl" name="IsLibraryCharacterTableRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctbl" name="IsLibraryCharacterTableRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -713,10 +713,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctbl" name="IsLibraryCharacterTableRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctbl" name="IsLibraryCharacterTableRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/ctblfuns.omdoc b/content/http..www.gap-system.org/lib/ctblfuns.omdoc
index b485e4542014d1a2f0d104d209f87bdac5b5d7c2..8c47f585b793a917782c6c6b7bc3ae8cc4f0dc76 100644
--- a/content/http..www.gap-system.org/lib/ctblfuns.omdoc
+++ b/content/http..www.gap-system.org/lib/ctblfuns.omdoc
@@ -12,13 +12,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsList"></om:OMS>
       </om:OMA>
@@ -36,13 +36,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDenseList"></om:OMS>
       </om:OMA>
@@ -60,13 +60,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsHomogeneousList"></om:OMS>
       </om:OMA>
@@ -84,13 +84,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -108,13 +108,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -132,13 +132,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsFinite"></om:OMS>
       </om:OMA>
@@ -156,13 +156,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsFinite"></om:OMS>
       </om:OMA>
@@ -180,13 +180,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -204,13 +204,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -234,13 +234,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -258,13 +258,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -288,13 +288,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -312,13 +312,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -342,13 +342,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -366,13 +366,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -396,13 +396,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -420,13 +420,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -450,13 +450,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -474,13 +474,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -504,13 +504,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -528,13 +528,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -558,13 +558,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -582,13 +582,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -612,13 +612,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -636,13 +636,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -666,13 +666,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -690,13 +690,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -720,13 +720,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsGeneralizedRowVector"></om:OMS>
       </om:OMA>
@@ -744,13 +744,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -768,13 +768,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsCommutativeElement"></om:OMS>
       </om:OMA>
@@ -783,7 +783,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?ctblfuns"></import><import from="http://www.gap-system.org/lib?ctbl"></import><constant name="IsCharacter">
+     </constant><import from="http://www.gap-system.org/lib?ctbl"></import><constant name="IsCharacter">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
@@ -869,10 +869,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -887,10 +887,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -905,10 +905,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -926,10 +926,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -947,10 +947,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -968,10 +968,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -989,10 +989,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -1010,10 +1010,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1037,10 +1037,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1064,10 +1064,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1091,10 +1091,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1118,10 +1118,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1145,10 +1145,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -1166,10 +1166,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsExtLSet"></om:OMS>
       </om:OMA>
@@ -1187,10 +1187,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpEProd"></om:OMS>
       </om:OMA>
@@ -1208,10 +1208,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpDSum"></om:OMS>
       </om:OMA>
@@ -1229,10 +1229,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpESum"></om:OMS>
       </om:OMA>
@@ -1250,10 +1250,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsTrivialLOpEOne"></om:OMS>
       </om:OMA>
@@ -1271,10 +1271,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnByRing"></om:OMS>
       </om:OMA>
@@ -1292,10 +1292,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagma"></om:OMS>
       </om:OMA>
@@ -1313,10 +1313,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagmaWithZero"></om:OMS>
       </om:OMA>
@@ -1334,10 +1334,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveGroup"></om:OMS>
       </om:OMA>
@@ -1355,10 +1355,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -1376,10 +1376,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -1397,10 +1397,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFreeLeftModule"></om:OMS>
       </om:OMA>
@@ -1418,10 +1418,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ctblfuns" name="IsClassFunctionsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsHandledByNiceBasis"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/cyclotom.omdoc b/content/http..www.gap-system.org/lib/cyclotom.omdoc
index aaccea60f59b17a2e90163ace7ea2c1eba4d0d86..411cf18f27b653ae6dc8624c1cbf895f8d3b7efd 100644
--- a/content/http..www.gap-system.org/lib/cyclotom.omdoc
+++ b/content/http..www.gap-system.org/lib/cyclotom.omdoc
@@ -12,13 +12,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsCyclotomic"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -36,13 +36,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsCyclotomic"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -60,13 +60,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsCyclotomic"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -84,13 +84,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsCyclotomic"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -108,13 +108,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsCyclotomic"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -132,13 +132,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsCyclotomic"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -156,13 +156,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsCyclotomic"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -180,13 +180,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsCyclotomic"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -204,13 +204,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsCyclotomic"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -228,13 +228,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsCyclotomic"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -252,13 +252,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsCyclotomic"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZDFRE"></om:OMS>
       </om:OMA>
@@ -276,13 +276,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsCyclotomic"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -300,13 +300,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsCyclotomic"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditivelyCommutativeElement"></om:OMS>
       </om:OMA>
@@ -324,13 +324,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsCyclotomic"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsCommutativeElement"></om:OMS>
       </om:OMA>
@@ -339,7 +339,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?cyclotom"></import><constant name="IsCyc">
+     </constant><constant name="IsCyc">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="category"></om:OMS></om:OMOBJ></type>
        
@@ -353,13 +353,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsCyc"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -377,13 +377,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsCyc"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -401,13 +401,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsCyc"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -425,13 +425,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsCyc"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -449,13 +449,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsCyc"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -473,13 +473,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsCyc"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -497,13 +497,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsCyc"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -521,13 +521,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsCyc"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -545,13 +545,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsCyc"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -569,13 +569,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsCyc"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -593,13 +593,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsCyc"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZDFRE"></om:OMS>
       </om:OMA>
@@ -617,13 +617,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsCyc"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -641,13 +641,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsCyc"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditivelyCommutativeElement"></om:OMS>
       </om:OMA>
@@ -665,13 +665,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsCyc"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsCommutativeElement"></om:OMS>
       </om:OMA>
@@ -689,13 +689,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsCyc"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsCyclotomic"></om:OMS>
       </om:OMA>
@@ -718,13 +718,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsRat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsCyc"></om:OMS>
       </om:OMA>
@@ -742,13 +742,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsRat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -766,13 +766,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsRat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -790,13 +790,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsRat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -814,13 +814,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsRat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -838,13 +838,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsRat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -862,13 +862,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsRat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -886,13 +886,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsRat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -910,13 +910,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsRat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -934,13 +934,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsRat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -958,13 +958,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsRat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -982,13 +982,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsRat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZDFRE"></om:OMS>
       </om:OMA>
@@ -1006,13 +1006,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsRat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -1030,13 +1030,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsRat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditivelyCommutativeElement"></om:OMS>
       </om:OMA>
@@ -1054,13 +1054,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsRat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsCommutativeElement"></om:OMS>
       </om:OMA>
@@ -1078,13 +1078,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsRat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsCyclotomic"></om:OMS>
       </om:OMA>
@@ -1107,13 +1107,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsInt"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsRat"></om:OMS>
       </om:OMA>
@@ -1131,13 +1131,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsInt"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsCyc"></om:OMS>
       </om:OMA>
@@ -1155,13 +1155,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsInt"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -1179,13 +1179,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsInt"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -1203,13 +1203,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsInt"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -1227,13 +1227,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsInt"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -1251,13 +1251,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsInt"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -1275,13 +1275,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsInt"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -1299,13 +1299,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsInt"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -1323,13 +1323,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsInt"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -1347,13 +1347,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsInt"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -1371,13 +1371,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsInt"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -1395,13 +1395,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsInt"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZDFRE"></om:OMS>
       </om:OMA>
@@ -1419,13 +1419,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsInt"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -1443,13 +1443,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsInt"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditivelyCommutativeElement"></om:OMS>
       </om:OMA>
@@ -1467,13 +1467,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsInt"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsCommutativeElement"></om:OMS>
       </om:OMA>
@@ -1491,13 +1491,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsInt"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsCyclotomic"></om:OMS>
       </om:OMA>
@@ -1520,13 +1520,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsPosRat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsRat"></om:OMS>
       </om:OMA>
@@ -1544,13 +1544,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsPosRat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsCyc"></om:OMS>
       </om:OMA>
@@ -1568,13 +1568,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsPosRat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -1592,13 +1592,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsPosRat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -1616,13 +1616,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsPosRat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -1640,13 +1640,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsPosRat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -1664,13 +1664,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsPosRat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -1688,13 +1688,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsPosRat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -1712,13 +1712,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsPosRat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -1736,13 +1736,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsPosRat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -1760,13 +1760,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsPosRat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -1784,13 +1784,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsPosRat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -1808,13 +1808,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsPosRat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZDFRE"></om:OMS>
       </om:OMA>
@@ -1832,13 +1832,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsPosRat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -1856,13 +1856,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsPosRat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditivelyCommutativeElement"></om:OMS>
       </om:OMA>
@@ -1880,13 +1880,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsPosRat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsCommutativeElement"></om:OMS>
       </om:OMA>
@@ -1904,13 +1904,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsPosRat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsCyclotomic"></om:OMS>
       </om:OMA>
@@ -1933,13 +1933,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsNegInfinity"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -1957,13 +1957,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsNegInfinity"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -1981,13 +1981,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsNegInfinity"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -2005,13 +2005,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsNegInfinity"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -2029,13 +2029,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsNegInfinity"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -2053,13 +2053,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsNegInfinity"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -2077,13 +2077,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsNegInfinity"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -2101,13 +2101,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsNegInfinity"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -2125,13 +2125,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsNegInfinity"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -2149,13 +2149,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsNegInfinity"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -2173,13 +2173,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsNegInfinity"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZDFRE"></om:OMS>
       </om:OMA>
@@ -2197,13 +2197,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsNegInfinity"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -2221,13 +2221,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsNegInfinity"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditivelyCommutativeElement"></om:OMS>
       </om:OMA>
@@ -2245,13 +2245,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsNegInfinity"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsCommutativeElement"></om:OMS>
       </om:OMA>
@@ -2269,13 +2269,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsNegInfinity"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsCyclotomic"></om:OMS>
       </om:OMA>
@@ -2306,13 +2306,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsZeroCyc"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsInt"></om:OMS>
       </om:OMA>
@@ -2330,13 +2330,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsZeroCyc"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsRat"></om:OMS>
       </om:OMA>
@@ -2354,13 +2354,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsZeroCyc"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsCyc"></om:OMS>
       </om:OMA>
@@ -2378,13 +2378,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsZeroCyc"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -2402,13 +2402,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsZeroCyc"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -2426,13 +2426,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsZeroCyc"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -2450,13 +2450,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsZeroCyc"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -2474,13 +2474,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsZeroCyc"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -2498,13 +2498,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsZeroCyc"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -2522,13 +2522,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsZeroCyc"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -2546,13 +2546,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsZeroCyc"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -2570,13 +2570,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsZeroCyc"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -2594,13 +2594,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsZeroCyc"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -2618,13 +2618,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsZeroCyc"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZDFRE"></om:OMS>
       </om:OMA>
@@ -2642,13 +2642,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsZeroCyc"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -2666,13 +2666,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsZeroCyc"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditivelyCommutativeElement"></om:OMS>
       </om:OMA>
@@ -2690,13 +2690,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsZeroCyc"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsCommutativeElement"></om:OMS>
       </om:OMA>
@@ -2714,13 +2714,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsZeroCyc"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZero"></om:OMS>
       </om:OMA>
@@ -2738,13 +2738,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsZeroCyc"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZero"></om:OMS>
       </om:OMA>
@@ -2762,13 +2762,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsZeroCyc"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsCyclotomic"></om:OMS>
       </om:OMA>
@@ -2805,13 +2805,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsInfinity"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -2829,13 +2829,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsInfinity"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -2853,13 +2853,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsInfinity"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -2877,13 +2877,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsInfinity"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -2901,13 +2901,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsInfinity"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -2925,13 +2925,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsInfinity"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -2949,13 +2949,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsInfinity"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -2973,13 +2973,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsInfinity"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -2997,13 +2997,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsInfinity"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -3021,13 +3021,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsInfinity"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -3045,13 +3045,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsInfinity"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZDFRE"></om:OMS>
       </om:OMA>
@@ -3069,13 +3069,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsInfinity"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -3093,13 +3093,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsInfinity"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditivelyCommutativeElement"></om:OMS>
       </om:OMA>
@@ -3117,13 +3117,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsInfinity"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsCommutativeElement"></om:OMS>
       </om:OMA>
@@ -3141,13 +3141,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsInfinity"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsCyclotomic"></om:OMS>
       </om:OMA>
@@ -3170,13 +3170,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsNegRat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsRat"></om:OMS>
       </om:OMA>
@@ -3194,13 +3194,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsNegRat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsCyc"></om:OMS>
       </om:OMA>
@@ -3218,13 +3218,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsNegRat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -3242,13 +3242,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsNegRat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -3266,13 +3266,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsNegRat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -3290,13 +3290,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsNegRat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -3314,13 +3314,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsNegRat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -3338,13 +3338,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsNegRat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -3362,13 +3362,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsNegRat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -3386,13 +3386,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsNegRat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -3410,13 +3410,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsNegRat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -3434,13 +3434,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsNegRat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -3458,13 +3458,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsNegRat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZDFRE"></om:OMS>
       </om:OMA>
@@ -3482,13 +3482,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsNegRat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -3506,13 +3506,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsNegRat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditivelyCommutativeElement"></om:OMS>
       </om:OMA>
@@ -3530,13 +3530,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsNegRat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsCommutativeElement"></om:OMS>
       </om:OMA>
@@ -3554,13 +3554,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsNegRat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsCyclotomic"></om:OMS>
       </om:OMA>
@@ -3613,10 +3613,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsSmallIntRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsSmallIntRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsInternalRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsInternalRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/dict.omdoc b/content/http..www.gap-system.org/lib/dict.omdoc
index 15e59b4a912a640c0c8d6257a453d3122a327307..dda8f8f97743602b68c05623fc27b3c607425a7e 100644
--- a/content/http..www.gap-system.org/lib/dict.omdoc
+++ b/content/http..www.gap-system.org/lib/dict.omdoc
@@ -12,13 +12,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsDictionary"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -36,13 +36,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsDictionary"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -51,7 +51,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?object"></import><import from="http://www.gap-system.org/lib?dict"></import><constant name="AddDictionary">
+     </constant><import from="http://www.gap-system.org/lib?object"></import><constant name="AddDictionary">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
@@ -81,13 +81,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsLookupDictionary"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -105,13 +105,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsLookupDictionary"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -129,13 +129,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsLookupDictionary"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsDictionary"></om:OMS>
       </om:OMA>
@@ -158,10 +158,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsDictionaryDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsDictionaryDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -176,10 +176,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsDictionaryDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsDictionaryDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -197,10 +197,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsDictionaryDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsDictionaryDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -218,10 +218,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsDictionaryDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsDictionaryDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsDictionary"></om:OMS>
       </om:OMA>
@@ -244,10 +244,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsListDictionary"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsListDictionary"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -262,10 +262,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsListDictionary"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsListDictionary"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -283,10 +283,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsListDictionary"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsListDictionary"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -304,10 +304,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsListDictionary"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsListDictionary"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsDictionary"></om:OMS>
       </om:OMA>
@@ -325,10 +325,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsListDictionary"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsListDictionary"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsDictionaryDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsDictionaryDefaultRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -348,10 +348,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsListLookupDictionary"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsListLookupDictionary"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -366,10 +366,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsListLookupDictionary"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsListLookupDictionary"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -387,10 +387,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsListLookupDictionary"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsListLookupDictionary"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -408,10 +408,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsListLookupDictionary"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsListLookupDictionary"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsDictionary"></om:OMS>
       </om:OMA>
@@ -429,10 +429,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsListLookupDictionary"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsListLookupDictionary"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsLookupDictionary"></om:OMS>
       </om:OMA>
@@ -450,10 +450,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsListLookupDictionary"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsListLookupDictionary"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsDictionaryDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsDictionaryDefaultRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -468,10 +468,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsListLookupDictionary"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsListLookupDictionary"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsListDictionary"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsListDictionary"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -491,10 +491,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsSortDictionary"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsSortDictionary"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -509,10 +509,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsSortDictionary"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsSortDictionary"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -530,10 +530,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsSortDictionary"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsSortDictionary"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -551,10 +551,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsSortDictionary"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsSortDictionary"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsDictionary"></om:OMS>
       </om:OMA>
@@ -572,10 +572,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsSortDictionary"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsSortDictionary"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsDictionaryDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsDictionaryDefaultRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -590,10 +590,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsSortDictionary"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsSortDictionary"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsListDictionary"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsListDictionary"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -613,10 +613,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsSortLookupDictionary"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsSortLookupDictionary"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -631,10 +631,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsSortLookupDictionary"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsSortLookupDictionary"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -652,10 +652,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsSortLookupDictionary"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsSortLookupDictionary"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -673,10 +673,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsSortLookupDictionary"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsSortLookupDictionary"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsDictionary"></om:OMS>
       </om:OMA>
@@ -694,10 +694,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsSortLookupDictionary"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsSortLookupDictionary"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsLookupDictionary"></om:OMS>
       </om:OMA>
@@ -715,10 +715,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsSortLookupDictionary"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsSortLookupDictionary"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsDictionaryDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsDictionaryDefaultRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -733,10 +733,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsSortLookupDictionary"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsSortLookupDictionary"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsListDictionary"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsListDictionary"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -751,10 +751,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsSortLookupDictionary"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsSortLookupDictionary"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsListLookupDictionary"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsListLookupDictionary"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -769,10 +769,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsSortLookupDictionary"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsSortLookupDictionary"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsSortDictionary"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsSortDictionary"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -808,10 +808,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsPositionDictionary"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsPositionDictionary"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -826,10 +826,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsPositionDictionary"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsPositionDictionary"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -847,10 +847,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsPositionDictionary"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsPositionDictionary"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -868,10 +868,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsPositionDictionary"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsPositionDictionary"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsDictionary"></om:OMS>
       </om:OMA>
@@ -889,10 +889,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsPositionDictionary"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsPositionDictionary"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsDictionaryDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsDictionaryDefaultRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -912,13 +912,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsHash"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -936,13 +936,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsHash"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -960,13 +960,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsHash"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsDictionary"></om:OMS>
       </om:OMA>
@@ -984,13 +984,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsHash"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsLookupDictionary"></om:OMS>
       </om:OMA>
@@ -1037,10 +1037,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsDenseHashRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsDenseHashRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1055,10 +1055,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsDenseHashRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsDenseHashRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -1076,10 +1076,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsDenseHashRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsDenseHashRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -1097,10 +1097,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsDenseHashRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsDenseHashRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsDictionary"></om:OMS>
       </om:OMA>
@@ -1118,10 +1118,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsDenseHashRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsDenseHashRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsLookupDictionary"></om:OMS>
       </om:OMA>
@@ -1139,10 +1139,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsDenseHashRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsDenseHashRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsHash"></om:OMS>
       </om:OMA>
@@ -1181,10 +1181,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsPositionLookupDictionary"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsPositionLookupDictionary"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1199,10 +1199,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsPositionLookupDictionary"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsPositionLookupDictionary"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -1220,10 +1220,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsPositionLookupDictionary"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsPositionLookupDictionary"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -1241,10 +1241,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsPositionLookupDictionary"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsPositionLookupDictionary"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsDictionary"></om:OMS>
       </om:OMA>
@@ -1262,10 +1262,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsPositionLookupDictionary"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsPositionLookupDictionary"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsLookupDictionary"></om:OMS>
       </om:OMA>
@@ -1283,10 +1283,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsPositionLookupDictionary"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsPositionLookupDictionary"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsDictionaryDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsDictionaryDefaultRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1301,10 +1301,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsPositionLookupDictionary"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsPositionLookupDictionary"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsPositionDictionary"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsPositionDictionary"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1324,10 +1324,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsSparseHashRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsSparseHashRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1342,10 +1342,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsSparseHashRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsSparseHashRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -1363,10 +1363,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsSparseHashRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsSparseHashRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -1384,10 +1384,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsSparseHashRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsSparseHashRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsDictionary"></om:OMS>
       </om:OMA>
@@ -1405,10 +1405,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsSparseHashRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsSparseHashRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsLookupDictionary"></om:OMS>
       </om:OMA>
@@ -1426,10 +1426,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsSparseHashRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsSparseHashRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="dict" name="IsHash"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/domain.omdoc b/content/http..www.gap-system.org/lib/domain.omdoc
index 0fe6ebc1f747b1d19922814d9bfff9e230554d36..a0da89a83284e6a3b842089c51b744709cffa876 100644
--- a/content/http..www.gap-system.org/lib/domain.omdoc
+++ b/content/http..www.gap-system.org/lib/domain.omdoc
@@ -3,7 +3,7 @@
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="category"></om:OMS></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?coll"></import><import from="http://www.gap-system.org/lib?domain"></import><constant name="ParentAttr">
+     </constant><import from="http://www.gap-system.org/lib?coll"></import><constant name="ParentAttr">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
diff --git a/content/http..www.gap-system.org/lib/extaset.omdoc b/content/http..www.gap-system.org/lib/extaset.omdoc
index 246990a299744f961ca655f3c96b446627a12b74..0caeca9ddc8c8c14e0bdc46fd6c3548a6ff59710 100644
--- a/content/http..www.gap-system.org/lib/extaset.omdoc
+++ b/content/http..www.gap-system.org/lib/extaset.omdoc
@@ -12,13 +12,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extaset" name="IsExtASet"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -36,13 +36,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extaset" name="IsExtASet"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -60,13 +60,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extaset" name="IsExtASet"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -84,13 +84,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extaset" name="IsExtASet"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -108,13 +108,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extaset" name="IsExtASet"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -132,13 +132,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extaset" name="IsExtASet"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -156,13 +156,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extaset" name="IsExtASet"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -180,13 +180,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extaset" name="IsExtASet"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -195,7 +195,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?extaset"></import><constant name="IsAssociativeAOpESum">
+     </constant><constant name="IsAssociativeAOpESum">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="category"></om:OMS></om:OMOBJ></type>
        
@@ -209,13 +209,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extaset" name="IsAssociativeAOpESum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -233,13 +233,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extaset" name="IsAssociativeAOpESum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -257,13 +257,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extaset" name="IsAssociativeAOpESum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -281,13 +281,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extaset" name="IsAssociativeAOpESum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -305,13 +305,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extaset" name="IsAssociativeAOpESum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -329,13 +329,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extaset" name="IsAssociativeAOpESum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -353,13 +353,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extaset" name="IsAssociativeAOpESum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -377,13 +377,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extaset" name="IsAssociativeAOpESum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -401,13 +401,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extaset" name="IsAssociativeAOpESum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extaset" name="IsExtASet"></om:OMS>
       </om:OMA>
@@ -430,13 +430,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extaset" name="IsTrivialAOpEZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -454,13 +454,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extaset" name="IsTrivialAOpEZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -478,13 +478,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extaset" name="IsTrivialAOpEZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -502,13 +502,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extaset" name="IsTrivialAOpEZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -526,13 +526,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extaset" name="IsTrivialAOpEZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -550,13 +550,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extaset" name="IsTrivialAOpEZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -574,13 +574,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extaset" name="IsTrivialAOpEZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -598,13 +598,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extaset" name="IsTrivialAOpEZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -622,13 +622,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extaset" name="IsTrivialAOpEZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extaset" name="IsExtASet"></om:OMS>
       </om:OMA>
@@ -659,13 +659,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extaset" name="IsAssociativeAOpDSum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -683,13 +683,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extaset" name="IsAssociativeAOpDSum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -707,13 +707,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extaset" name="IsAssociativeAOpDSum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -731,13 +731,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extaset" name="IsAssociativeAOpDSum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -755,13 +755,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extaset" name="IsAssociativeAOpDSum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -779,13 +779,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extaset" name="IsAssociativeAOpDSum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -803,13 +803,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extaset" name="IsAssociativeAOpDSum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -827,13 +827,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extaset" name="IsAssociativeAOpDSum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -851,13 +851,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extaset" name="IsAssociativeAOpDSum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extaset" name="IsExtASet"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/extlset.omdoc b/content/http..www.gap-system.org/lib/extlset.omdoc
index b1f482d91425ad21b1d68ad269c12f9d030fe4b2..c3ed4a10849fcd4f74d555c77818c531b877cc18 100644
--- a/content/http..www.gap-system.org/lib/extlset.omdoc
+++ b/content/http..www.gap-system.org/lib/extlset.omdoc
@@ -12,13 +12,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsExtLSet"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -36,13 +36,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsExtLSet"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -60,13 +60,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsExtLSet"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -84,13 +84,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsExtLSet"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -108,13 +108,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsExtLSet"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -123,7 +123,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?extlset"></import><constant name="IsAssociativeLOpDProd">
+     </constant><constant name="IsAssociativeLOpDProd">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="category"></om:OMS></om:OMOBJ></type>
        
@@ -137,13 +137,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpDProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -161,13 +161,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpDProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -185,13 +185,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpDProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -209,13 +209,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpDProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -233,13 +233,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpDProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -257,13 +257,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpDProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsExtLSet"></om:OMS>
       </om:OMA>
@@ -286,13 +286,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpEProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -310,13 +310,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpEProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -334,13 +334,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpEProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -358,13 +358,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpEProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -382,13 +382,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpEProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -406,13 +406,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpEProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsExtLSet"></om:OMS>
       </om:OMA>
@@ -435,13 +435,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpDSum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -459,13 +459,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpDSum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -483,13 +483,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpDSum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -507,13 +507,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpDSum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -531,13 +531,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpDSum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -555,13 +555,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpDSum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsExtLSet"></om:OMS>
       </om:OMA>
@@ -584,13 +584,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpESum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -608,13 +608,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpESum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -632,13 +632,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpESum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -656,13 +656,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpESum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -680,13 +680,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpESum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -704,13 +704,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpESum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsExtLSet"></om:OMS>
       </om:OMA>
@@ -733,13 +733,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsTrivialLOpEOne"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -757,13 +757,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsTrivialLOpEOne"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -781,13 +781,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsTrivialLOpEOne"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -805,13 +805,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsTrivialLOpEOne"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -829,13 +829,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsTrivialLOpEOne"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -853,13 +853,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsTrivialLOpEOne"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsExtLSet"></om:OMS>
       </om:OMA>
@@ -882,13 +882,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnByRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -906,13 +906,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnByRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -930,13 +930,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnByRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -954,13 +954,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnByRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -978,13 +978,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnByRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -1002,13 +1002,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnByRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsExtLSet"></om:OMS>
       </om:OMA>
@@ -1039,13 +1039,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpEProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -1063,13 +1063,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpEProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -1087,13 +1087,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpEProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1111,13 +1111,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpEProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1135,13 +1135,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpEProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -1159,13 +1159,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpEProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsExtLSet"></om:OMS>
       </om:OMA>
@@ -1188,13 +1188,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsTrivialLOpEZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -1212,13 +1212,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsTrivialLOpEZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -1236,13 +1236,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsTrivialLOpEZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1260,13 +1260,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsTrivialLOpEZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1284,13 +1284,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsTrivialLOpEZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -1308,13 +1308,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsTrivialLOpEZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsExtLSet"></om:OMS>
       </om:OMA>
@@ -1337,13 +1337,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnBySuperset"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -1361,13 +1361,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnBySuperset"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -1385,13 +1385,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnBySuperset"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1409,13 +1409,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnBySuperset"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1433,13 +1433,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnBySuperset"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -1457,13 +1457,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnBySuperset"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsExtLSet"></om:OMS>
       </om:OMA>
@@ -1502,13 +1502,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpDProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -1526,13 +1526,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpDProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -1550,13 +1550,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpDProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1574,13 +1574,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpDProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1598,13 +1598,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpDProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -1622,13 +1622,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpDProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsExtLSet"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/extrset.omdoc b/content/http..www.gap-system.org/lib/extrset.omdoc
index 54c8d729781026579f36eb73f54c6172ce538c48..0ccf77259a3695dc88281ff0e8971c4c59bba269 100644
--- a/content/http..www.gap-system.org/lib/extrset.omdoc
+++ b/content/http..www.gap-system.org/lib/extrset.omdoc
@@ -12,13 +12,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsExtRSet"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -36,13 +36,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsExtRSet"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -60,13 +60,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsExtRSet"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -84,13 +84,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsExtRSet"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -108,13 +108,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsExtRSet"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -123,7 +123,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?extrset"></import><constant name="IsRightActedOnBySuperset">
+     </constant><constant name="IsRightActedOnBySuperset">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="category"></om:OMS></om:OMOBJ></type>
        
@@ -137,13 +137,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsRightActedOnBySuperset"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -161,13 +161,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsRightActedOnBySuperset"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -185,13 +185,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsRightActedOnBySuperset"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -209,13 +209,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsRightActedOnBySuperset"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -233,13 +233,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsRightActedOnBySuperset"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -257,13 +257,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsRightActedOnBySuperset"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsExtRSet"></om:OMS>
       </om:OMA>
@@ -286,13 +286,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsAssociativeROpEProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -310,13 +310,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsAssociativeROpEProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -334,13 +334,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsAssociativeROpEProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -358,13 +358,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsAssociativeROpEProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -382,13 +382,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsAssociativeROpEProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -406,13 +406,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsAssociativeROpEProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsExtRSet"></om:OMS>
       </om:OMA>
@@ -435,13 +435,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsDistributiveROpDSum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -459,13 +459,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsDistributiveROpDSum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -483,13 +483,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsDistributiveROpDSum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -507,13 +507,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsDistributiveROpDSum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -531,13 +531,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsDistributiveROpDSum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -555,13 +555,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsDistributiveROpDSum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsExtRSet"></om:OMS>
       </om:OMA>
@@ -584,13 +584,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsDistributiveROpESum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -608,13 +608,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsDistributiveROpESum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -632,13 +632,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsDistributiveROpESum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -656,13 +656,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsDistributiveROpESum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -680,13 +680,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsDistributiveROpESum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -704,13 +704,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsDistributiveROpESum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsExtRSet"></om:OMS>
       </om:OMA>
@@ -733,13 +733,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsTrivialROpEOne"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -757,13 +757,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsTrivialROpEOne"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -781,13 +781,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsTrivialROpEOne"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -805,13 +805,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsTrivialROpEOne"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -829,13 +829,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsTrivialROpEOne"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -853,13 +853,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsTrivialROpEOne"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsExtRSet"></om:OMS>
       </om:OMA>
@@ -882,13 +882,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsRightActedOnByRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -906,13 +906,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsRightActedOnByRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -930,13 +930,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsRightActedOnByRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -954,13 +954,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsRightActedOnByRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -978,13 +978,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsRightActedOnByRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -1002,13 +1002,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsRightActedOnByRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsExtRSet"></om:OMS>
       </om:OMA>
@@ -1047,13 +1047,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsTrivialROpEZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -1071,13 +1071,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsTrivialROpEZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -1095,13 +1095,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsTrivialROpEZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1119,13 +1119,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsTrivialROpEZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1143,13 +1143,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsTrivialROpEZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -1167,13 +1167,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsTrivialROpEZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsExtRSet"></om:OMS>
       </om:OMA>
@@ -1196,13 +1196,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsDistributiveROpDProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -1220,13 +1220,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsDistributiveROpDProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -1244,13 +1244,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsDistributiveROpDProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1268,13 +1268,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsDistributiveROpDProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1292,13 +1292,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsDistributiveROpDProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -1316,13 +1316,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsDistributiveROpDProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsExtRSet"></om:OMS>
       </om:OMA>
@@ -1345,13 +1345,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsRightActedOnByDivisionRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -1369,13 +1369,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsRightActedOnByDivisionRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -1393,13 +1393,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsRightActedOnByDivisionRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1417,13 +1417,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsRightActedOnByDivisionRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1441,13 +1441,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsRightActedOnByDivisionRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -1465,13 +1465,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsRightActedOnByDivisionRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsExtRSet"></om:OMS>
       </om:OMA>
@@ -1489,13 +1489,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsRightActedOnByDivisionRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsRightActedOnByRing"></om:OMS>
       </om:OMA>
@@ -1518,13 +1518,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsAssociativeROpDProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -1542,13 +1542,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsAssociativeROpDProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -1566,13 +1566,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsAssociativeROpDProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1590,13 +1590,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsAssociativeROpDProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1614,13 +1614,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsAssociativeROpDProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -1638,13 +1638,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsAssociativeROpDProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsExtRSet"></om:OMS>
       </om:OMA>
@@ -1667,13 +1667,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsDistributiveROpEProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -1691,13 +1691,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsDistributiveROpEProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -1715,13 +1715,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsDistributiveROpEProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1739,13 +1739,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsDistributiveROpEProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1763,13 +1763,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsDistributiveROpEProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -1787,13 +1787,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsDistributiveROpEProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extrset" name="IsExtRSet"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/extuset.omdoc b/content/http..www.gap-system.org/lib/extuset.omdoc
index 3ed3d92467e0da5d3bd95a3e5795dc532e15216b..55928318c1d6e3064cfa34352561eb38dc17ca6c 100644
--- a/content/http..www.gap-system.org/lib/extuset.omdoc
+++ b/content/http..www.gap-system.org/lib/extuset.omdoc
@@ -12,13 +12,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsExtUSet"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -36,13 +36,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsExtUSet"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -60,13 +60,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsExtUSet"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -84,13 +84,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsExtUSet"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -108,13 +108,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsExtUSet"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -123,7 +123,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?extuset"></import><constant name="IsTrivialUOpEOne">
+     </constant><constant name="IsTrivialUOpEOne">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="category"></om:OMS></om:OMOBJ></type>
        
@@ -137,13 +137,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsTrivialUOpEOne"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -161,13 +161,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsTrivialUOpEOne"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -185,13 +185,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsTrivialUOpEOne"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -209,13 +209,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsTrivialUOpEOne"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -233,13 +233,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsTrivialUOpEOne"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -257,13 +257,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsTrivialUOpEOne"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsExtUSet"></om:OMS>
       </om:OMA>
@@ -294,13 +294,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsDistributiveUOpDSum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -318,13 +318,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsDistributiveUOpDSum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -342,13 +342,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsDistributiveUOpDSum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -366,13 +366,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsDistributiveUOpDSum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -390,13 +390,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsDistributiveUOpDSum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -414,13 +414,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsDistributiveUOpDSum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsExtUSet"></om:OMS>
       </om:OMA>
@@ -443,13 +443,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsDistributiveUOpESum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -467,13 +467,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsDistributiveUOpESum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -491,13 +491,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsDistributiveUOpESum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -515,13 +515,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsDistributiveUOpESum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -539,13 +539,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsDistributiveUOpESum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -563,13 +563,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsDistributiveUOpESum"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsExtUSet"></om:OMS>
       </om:OMA>
@@ -592,13 +592,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsTrivialUOpEZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -616,13 +616,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsTrivialUOpEZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -640,13 +640,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsTrivialUOpEZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -664,13 +664,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsTrivialUOpEZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -688,13 +688,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsTrivialUOpEZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -712,13 +712,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsTrivialUOpEZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsExtUSet"></om:OMS>
       </om:OMA>
@@ -741,13 +741,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsDistributiveUOpEProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -765,13 +765,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsDistributiveUOpEProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -789,13 +789,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsDistributiveUOpEProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -813,13 +813,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsDistributiveUOpEProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -837,13 +837,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsDistributiveUOpEProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -861,13 +861,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsDistributiveUOpEProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsExtUSet"></om:OMS>
       </om:OMA>
@@ -890,13 +890,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsAssociativeUOpEProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -914,13 +914,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsAssociativeUOpEProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -938,13 +938,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsAssociativeUOpEProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -962,13 +962,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsAssociativeUOpEProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -986,13 +986,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsAssociativeUOpEProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -1010,13 +1010,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsAssociativeUOpEProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsExtUSet"></om:OMS>
       </om:OMA>
@@ -1047,13 +1047,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsAssociativeUOpDProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -1071,13 +1071,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsAssociativeUOpDProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -1095,13 +1095,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsAssociativeUOpDProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1119,13 +1119,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsAssociativeUOpDProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1143,13 +1143,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsAssociativeUOpDProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -1167,13 +1167,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsAssociativeUOpDProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsExtUSet"></om:OMS>
       </om:OMA>
@@ -1196,13 +1196,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsUpperActedOnBySuperset"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -1220,13 +1220,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsUpperActedOnBySuperset"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -1244,13 +1244,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsUpperActedOnBySuperset"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1268,13 +1268,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsUpperActedOnBySuperset"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1292,13 +1292,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsUpperActedOnBySuperset"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -1316,13 +1316,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsUpperActedOnBySuperset"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsExtUSet"></om:OMS>
       </om:OMA>
@@ -1345,13 +1345,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsDistributiveUOpDProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -1369,13 +1369,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsDistributiveUOpDProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -1393,13 +1393,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsDistributiveUOpDProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1417,13 +1417,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsDistributiveUOpDProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1441,13 +1441,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsDistributiveUOpDProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -1465,13 +1465,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsDistributiveUOpDProd"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsExtUSet"></om:OMS>
       </om:OMA>
@@ -1494,13 +1494,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsUpperActedOnByGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -1518,13 +1518,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsUpperActedOnByGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -1542,13 +1542,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsUpperActedOnByGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1566,13 +1566,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsUpperActedOnByGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1590,13 +1590,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsUpperActedOnByGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -1614,13 +1614,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsUpperActedOnByGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extuset" name="IsExtUSet"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/fastendo.omdoc b/content/http..www.gap-system.org/lib/fastendo.omdoc
index 7102a5bc50131613211f810eb5fddca324de8706..368f3f5a355a227874d878bd882550eb224b0ffe 100644
--- a/content/http..www.gap-system.org/lib/fastendo.omdoc
+++ b/content/http..www.gap-system.org/lib/fastendo.omdoc
@@ -12,10 +12,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fastendo" name="IsTransformationRepOfEndo"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fastendo" name="IsTransformationRepOfEndo"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -30,10 +30,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fastendo" name="IsTransformationRepOfEndo"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fastendo" name="IsTransformationRepOfEndo"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/ffe.omdoc b/content/http..www.gap-system.org/lib/ffe.omdoc
index f76f39e97ff4d632031599958ce2d9270981ac95..06baf283fde192326f7472ea939bd94b617c821d 100644
--- a/content/http..www.gap-system.org/lib/ffe.omdoc
+++ b/content/http..www.gap-system.org/lib/ffe.omdoc
@@ -12,13 +12,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ffe" name="IsFFE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -36,13 +36,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ffe" name="IsFFE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -60,13 +60,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ffe" name="IsFFE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -84,13 +84,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ffe" name="IsFFE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -108,13 +108,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ffe" name="IsFFE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -132,13 +132,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ffe" name="IsFFE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -156,13 +156,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ffe" name="IsFFE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -180,13 +180,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ffe" name="IsFFE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -204,13 +204,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ffe" name="IsFFE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -228,13 +228,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ffe" name="IsFFE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -252,13 +252,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ffe" name="IsFFE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZDFRE"></om:OMS>
       </om:OMA>
@@ -276,13 +276,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ffe" name="IsFFE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -300,13 +300,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ffe" name="IsFFE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditivelyCommutativeElement"></om:OMS>
       </om:OMA>
@@ -324,13 +324,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ffe" name="IsFFE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsCommutativeElement"></om:OMS>
       </om:OMA>
@@ -339,7 +339,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?ffe"></import><constant name="IsLogOrderedFFE">
+     </constant><constant name="IsLogOrderedFFE">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="category"></om:OMS></om:OMOBJ></type>
        
@@ -353,13 +353,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ffe" name="IsLogOrderedFFE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ffe" name="IsFFE"></om:OMS>
       </om:OMA>
@@ -377,13 +377,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ffe" name="IsLogOrderedFFE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -401,13 +401,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ffe" name="IsLogOrderedFFE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -425,13 +425,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ffe" name="IsLogOrderedFFE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -449,13 +449,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ffe" name="IsLogOrderedFFE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -473,13 +473,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ffe" name="IsLogOrderedFFE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -497,13 +497,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ffe" name="IsLogOrderedFFE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -521,13 +521,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ffe" name="IsLogOrderedFFE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -545,13 +545,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ffe" name="IsLogOrderedFFE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -569,13 +569,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ffe" name="IsLogOrderedFFE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -593,13 +593,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ffe" name="IsLogOrderedFFE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -617,13 +617,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ffe" name="IsLogOrderedFFE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZDFRE"></om:OMS>
       </om:OMA>
@@ -641,13 +641,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ffe" name="IsLogOrderedFFE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -665,13 +665,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ffe" name="IsLogOrderedFFE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditivelyCommutativeElement"></om:OMS>
       </om:OMA>
@@ -689,13 +689,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ffe" name="IsLogOrderedFFE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsCommutativeElement"></om:OMS>
       </om:OMA>
@@ -766,13 +766,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ffe" name="IsLexOrderedFFE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ffe" name="IsFFE"></om:OMS>
       </om:OMA>
@@ -790,13 +790,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ffe" name="IsLexOrderedFFE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -814,13 +814,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ffe" name="IsLexOrderedFFE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -838,13 +838,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ffe" name="IsLexOrderedFFE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -862,13 +862,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ffe" name="IsLexOrderedFFE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -886,13 +886,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ffe" name="IsLexOrderedFFE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -910,13 +910,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ffe" name="IsLexOrderedFFE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -934,13 +934,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ffe" name="IsLexOrderedFFE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -958,13 +958,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ffe" name="IsLexOrderedFFE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -982,13 +982,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ffe" name="IsLexOrderedFFE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -1006,13 +1006,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ffe" name="IsLexOrderedFFE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -1030,13 +1030,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ffe" name="IsLexOrderedFFE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZDFRE"></om:OMS>
       </om:OMA>
@@ -1054,13 +1054,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ffe" name="IsLexOrderedFFE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -1078,13 +1078,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ffe" name="IsLexOrderedFFE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditivelyCommutativeElement"></om:OMS>
       </om:OMA>
@@ -1102,13 +1102,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ffe" name="IsLexOrderedFFE"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsCommutativeElement"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/ffeconway.omdoc b/content/http..www.gap-system.org/lib/ffeconway.omdoc
index c28dd9f9de5eaef004cecfb3ff92948be24a9336..33be60f42928856be78961a891145518cf2ba15a 100644
--- a/content/http..www.gap-system.org/lib/ffeconway.omdoc
+++ b/content/http..www.gap-system.org/lib/ffeconway.omdoc
@@ -12,10 +12,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ffeconway" name="IsCoeffsModConwayPolRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ffeconway" name="IsCoeffsModConwayPolRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/field.omdoc b/content/http..www.gap-system.org/lib/field.omdoc
index bc9d50848f556d784e3b6f186e2193643a08e7ec..8b8caae488f36d39596f4debd8af1f02ae90cf84 100644
--- a/content/http..www.gap-system.org/lib/field.omdoc
+++ b/content/http..www.gap-system.org/lib/field.omdoc
@@ -216,13 +216,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -240,13 +240,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -264,13 +264,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsNonTrivial"></om:OMS>
       </om:OMA>
@@ -288,13 +288,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsNonTrivial"></om:OMS>
       </om:OMA>
@@ -312,13 +312,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -336,13 +336,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -360,13 +360,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -384,13 +384,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -414,13 +414,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -444,13 +444,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -474,13 +474,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -504,13 +504,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -534,13 +534,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -558,13 +558,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -588,13 +588,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -612,13 +612,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -642,13 +642,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -672,13 +672,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -702,13 +702,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -726,13 +726,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsExtLSet"></om:OMS>
       </om:OMA>
@@ -750,13 +750,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpDProd"></om:OMS>
       </om:OMA>
@@ -774,13 +774,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpEProd"></om:OMS>
       </om:OMA>
@@ -798,13 +798,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpDSum"></om:OMS>
       </om:OMA>
@@ -822,13 +822,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpESum"></om:OMS>
       </om:OMA>
@@ -846,13 +846,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsTrivialLOpEOne"></om:OMS>
       </om:OMA>
@@ -870,13 +870,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnByRing"></om:OMS>
       </om:OMA>
@@ -894,13 +894,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnByDivisionRing"></om:OMS>
       </om:OMA>
@@ -918,13 +918,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnByDivisionRing"></om:OMS>
       </om:OMA>
@@ -942,13 +942,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagma"></om:OMS>
       </om:OMA>
@@ -966,13 +966,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithOne"></om:OMS>
       </om:OMA>
@@ -990,13 +990,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithInversesIfNonzero"></om:OMS>
       </om:OMA>
@@ -1014,13 +1014,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsAssociative"></om:OMS>
       </om:OMA>
@@ -1038,13 +1038,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsAssociative"></om:OMS>
       </om:OMA>
@@ -1062,13 +1062,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsCommutative"></om:OMS>
       </om:OMA>
@@ -1086,13 +1086,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsCommutative"></om:OMS>
       </om:OMA>
@@ -1110,13 +1110,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="MultiplicativeNeutralElement"></om:OMS>
       </om:OMA>
@@ -1134,13 +1134,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsGeneratorsOfSemigroup"></om:OMS>
       </om:OMA>
@@ -1158,13 +1158,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsGeneratorsOfSemigroup"></om:OMS>
       </om:OMA>
@@ -1182,13 +1182,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsMonoidAsSemigroup"></om:OMS>
       </om:OMA>
@@ -1206,13 +1206,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsMonoidAsSemigroup"></om:OMS>
       </om:OMA>
@@ -1230,13 +1230,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagma"></om:OMS>
       </om:OMA>
@@ -1254,13 +1254,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagmaWithZero"></om:OMS>
       </om:OMA>
@@ -1278,13 +1278,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveGroup"></om:OMS>
       </om:OMA>
@@ -1302,13 +1302,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -1326,13 +1326,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -1350,13 +1350,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsLDistributive"></om:OMS>
       </om:OMA>
@@ -1374,13 +1374,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsLDistributive"></om:OMS>
       </om:OMA>
@@ -1398,13 +1398,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsRDistributive"></om:OMS>
       </om:OMA>
@@ -1422,13 +1422,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsRDistributive"></om:OMS>
       </om:OMA>
@@ -1446,13 +1446,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsUniqueFactorizationRing"></om:OMS>
       </om:OMA>
@@ -1470,13 +1470,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsEuclideanRing"></om:OMS>
       </om:OMA>
@@ -1494,13 +1494,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsIntegralRing"></om:OMS>
       </om:OMA>
@@ -1518,13 +1518,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsIntegralRing"></om:OMS>
       </om:OMA>
@@ -1542,13 +1542,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldControlledByGaloisGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFreeLeftModule"></om:OMS>
       </om:OMA>
@@ -1595,10 +1595,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1613,10 +1613,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1631,10 +1631,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -1652,10 +1652,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -1673,10 +1673,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1694,10 +1694,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1715,10 +1715,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -1736,10 +1736,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1763,10 +1763,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1790,10 +1790,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1817,10 +1817,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1844,10 +1844,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1871,10 +1871,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -1892,10 +1892,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsExtLSet"></om:OMS>
       </om:OMA>
@@ -1913,10 +1913,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpEProd"></om:OMS>
       </om:OMA>
@@ -1934,10 +1934,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpDSum"></om:OMS>
       </om:OMA>
@@ -1955,10 +1955,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpESum"></om:OMS>
       </om:OMA>
@@ -1976,10 +1976,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsTrivialLOpEOne"></om:OMS>
       </om:OMA>
@@ -1997,10 +1997,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnByRing"></om:OMS>
       </om:OMA>
@@ -2018,10 +2018,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagma"></om:OMS>
       </om:OMA>
@@ -2039,10 +2039,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagmaWithZero"></om:OMS>
       </om:OMA>
@@ -2060,10 +2060,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveGroup"></om:OMS>
       </om:OMA>
@@ -2081,10 +2081,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -2102,10 +2102,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -2123,10 +2123,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFreeLeftModule"></om:OMS>
       </om:OMA>
@@ -2144,10 +2144,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="field" name="IsFieldElementsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsHandledByNiceBasis"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/fieldfin.omdoc b/content/http..www.gap-system.org/lib/fieldfin.omdoc
index 98062721a41404a46f9b5e3791d05e5e30e13a27..dedb783e0014aff4d113ac85a909ff441b1f44fc 100644
--- a/content/http..www.gap-system.org/lib/fieldfin.omdoc
+++ b/content/http..www.gap-system.org/lib/fieldfin.omdoc
@@ -12,10 +12,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsFrobeniusAutomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsFrobeniusAutomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -30,10 +30,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsFrobeniusAutomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsFrobeniusAutomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -48,10 +48,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsFrobeniusAutomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsFrobeniusAutomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -69,10 +69,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsFrobeniusAutomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsFrobeniusAutomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -90,10 +90,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsFrobeniusAutomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsFrobeniusAutomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -111,10 +111,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsFrobeniusAutomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsFrobeniusAutomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -132,10 +132,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsFrobeniusAutomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsFrobeniusAutomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -153,10 +153,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsFrobeniusAutomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsFrobeniusAutomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -174,10 +174,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsFrobeniusAutomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsFrobeniusAutomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -195,10 +195,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsFrobeniusAutomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsFrobeniusAutomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -216,10 +216,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsFrobeniusAutomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsFrobeniusAutomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -237,10 +237,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsFrobeniusAutomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsFrobeniusAutomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -258,10 +258,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsFrobeniusAutomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsFrobeniusAutomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -279,10 +279,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsFrobeniusAutomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsFrobeniusAutomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -300,10 +300,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsFrobeniusAutomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsFrobeniusAutomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -321,10 +321,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsFrobeniusAutomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsFrobeniusAutomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsAddition"></om:OMS>
       </om:OMA>
@@ -342,10 +342,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsFrobeniusAutomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsFrobeniusAutomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsAddition"></om:OMS>
       </om:OMA>
@@ -363,10 +363,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsFrobeniusAutomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsFrobeniusAutomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsZero"></om:OMS>
       </om:OMA>
@@ -384,10 +384,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsFrobeniusAutomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsFrobeniusAutomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsZero"></om:OMS>
       </om:OMA>
@@ -405,10 +405,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsFrobeniusAutomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsFrobeniusAutomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsAdditiveInverses"></om:OMS>
       </om:OMA>
@@ -426,10 +426,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsFrobeniusAutomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsFrobeniusAutomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsAdditiveInverses"></om:OMS>
       </om:OMA>
@@ -447,10 +447,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsFrobeniusAutomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsFrobeniusAutomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsScalarMultiplication"></om:OMS>
       </om:OMA>
@@ -468,10 +468,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsFrobeniusAutomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsFrobeniusAutomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsScalarMultiplication"></om:OMS>
       </om:OMA>
@@ -489,10 +489,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsFrobeniusAutomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsFrobeniusAutomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="IsFieldHomomorphism"></om:OMS>
       </om:OMA>
@@ -510,10 +510,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsFrobeniusAutomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsFrobeniusAutomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="IsFieldHomomorphism"></om:OMS>
       </om:OMA>
@@ -536,10 +536,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsBasisFiniteFieldRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsBasisFiniteFieldRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -554,10 +554,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsBasisFiniteFieldRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fieldfin" name="IsBasisFiniteFieldRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/files.omdoc b/content/http..www.gap-system.org/lib/files.omdoc
index 4bc413b1ea96db0d0beb8d7b019545d017037752..6ff994428bd5dd3ff46aeb7771cf165f78da6853 100644
--- a/content/http..www.gap-system.org/lib/files.omdoc
+++ b/content/http..www.gap-system.org/lib/files.omdoc
@@ -28,10 +28,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="files" name="IsDirectoryRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="files" name="IsDirectoryRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -50,7 +50,7 @@
       </om:OMA></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?files"></import><import from="http://www.gap-system.org/lib?list"></import><constant name="Filename">
+     </constant><import from="http://www.gap-system.org/lib?list"></import><constant name="Filename">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
diff --git a/content/http..www.gap-system.org/lib/fitfree.omdoc b/content/http..www.gap-system.org/lib/fitfree.omdoc
index 2d682d31bd794a8b088dfaaf33dc7cae6252b740..eaf5a36c36c1b29bbedb5b2fad1618688e3d8b0f 100644
--- a/content/http..www.gap-system.org/lib/fitfree.omdoc
+++ b/content/http..www.gap-system.org/lib/fitfree.omdoc
@@ -20,10 +20,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -41,10 +41,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -62,10 +62,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsFinite"></om:OMS>
       </om:OMA>
@@ -83,10 +83,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsFinite"></om:OMS>
       </om:OMA>
@@ -104,10 +104,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -125,10 +125,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -146,10 +146,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -167,10 +167,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -194,10 +194,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -215,10 +215,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -242,10 +242,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -269,10 +269,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -296,10 +296,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -323,10 +323,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -350,10 +350,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -371,10 +371,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagma"></om:OMS>
       </om:OMA>
@@ -392,10 +392,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithOne"></om:OMS>
       </om:OMA>
@@ -413,10 +413,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithInversesIfNonzero"></om:OMS>
       </om:OMA>
@@ -434,10 +434,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithInverses"></om:OMS>
       </om:OMA>
@@ -455,10 +455,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsAssociative"></om:OMS>
       </om:OMA>
@@ -476,10 +476,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsAssociative"></om:OMS>
       </om:OMA>
@@ -497,10 +497,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="MultiplicativeNeutralElement"></om:OMS>
       </om:OMA>
@@ -518,10 +518,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsGeneratorsOfSemigroup"></om:OMS>
       </om:OMA>
@@ -539,10 +539,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsGeneratorsOfSemigroup"></om:OMS>
       </om:OMA>
@@ -560,10 +560,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsSimpleSemigroup"></om:OMS>
       </om:OMA>
@@ -581,10 +581,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsSimpleSemigroup"></om:OMS>
       </om:OMA>
@@ -602,10 +602,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsRegularSemigroup"></om:OMS>
       </om:OMA>
@@ -623,10 +623,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsRegularSemigroup"></om:OMS>
       </om:OMA>
@@ -644,10 +644,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsInverseSemigroup"></om:OMS>
       </om:OMA>
@@ -665,10 +665,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsInverseSemigroup"></om:OMS>
       </om:OMA>
@@ -686,10 +686,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsCompletelyRegularSemigroup"></om:OMS>
       </om:OMA>
@@ -707,10 +707,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsCompletelyRegularSemigroup"></om:OMS>
       </om:OMA>
@@ -728,10 +728,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsCompletelySimpleSemigroup"></om:OMS>
       </om:OMA>
@@ -749,10 +749,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsCompletelySimpleSemigroup"></om:OMS>
       </om:OMA>
@@ -770,10 +770,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsGroupAsSemigroup"></om:OMS>
       </om:OMA>
@@ -791,10 +791,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsGroupAsSemigroup"></om:OMS>
       </om:OMA>
@@ -812,10 +812,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsMonoidAsSemigroup"></om:OMS>
       </om:OMA>
@@ -833,10 +833,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsMonoidAsSemigroup"></om:OMS>
       </om:OMA>
@@ -854,10 +854,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsOrthodoxSemigroup"></om:OMS>
       </om:OMA>
@@ -875,10 +875,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsOrthodoxSemigroup"></om:OMS>
       </om:OMA>
@@ -896,10 +896,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grp" name="IsFinitelyGeneratedGroup"></om:OMS>
       </om:OMA>
@@ -917,10 +917,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grp" name="IsFinitelyGeneratedGroup"></om:OMS>
       </om:OMA>
@@ -938,10 +938,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grp" name="IsSubsetLocallyFiniteGroup"></om:OMS>
       </om:OMA>
@@ -959,10 +959,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grp" name="IsSubsetLocallyFiniteGroup"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/fldabnum.omdoc b/content/http..www.gap-system.org/lib/fldabnum.omdoc
index ae61b090340d55d65f36f7c1a607c93ec59befbc..27f108f37a7dae090ed2cb04d0d44b0325f2fa12 100644
--- a/content/http..www.gap-system.org/lib/fldabnum.omdoc
+++ b/content/http..www.gap-system.org/lib/fldabnum.omdoc
@@ -12,10 +12,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsCanonicalBasisAbelianNumberFieldRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsCanonicalBasisAbelianNumberFieldRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -30,16 +30,16 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsCanonicalBasisAbelianNumberFieldRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsCanonicalBasisAbelianNumberFieldRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?fldabnum"></import><constant name="IsCanonicalBasisCyclotomicFieldRep">
+     </constant><constant name="IsCanonicalBasisCyclotomicFieldRep">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="filter"></om:OMS></om:OMOBJ></type>
        
@@ -53,10 +53,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsCanonicalBasisCyclotomicFieldRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsCanonicalBasisCyclotomicFieldRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -71,10 +71,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsCanonicalBasisCyclotomicFieldRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsCanonicalBasisCyclotomicFieldRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -89,10 +89,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsCanonicalBasisCyclotomicFieldRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsCanonicalBasisCyclotomicFieldRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsCanonicalBasisAbelianNumberFieldRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsCanonicalBasisAbelianNumberFieldRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -120,10 +120,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsANFAutomorphismRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsANFAutomorphismRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -138,10 +138,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsANFAutomorphismRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsANFAutomorphismRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -177,13 +177,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -201,13 +201,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -225,13 +225,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsNonTrivial"></om:OMS>
       </om:OMA>
@@ -249,13 +249,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsNonTrivial"></om:OMS>
       </om:OMA>
@@ -273,13 +273,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -297,13 +297,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -321,13 +321,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -345,13 +345,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -375,13 +375,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -405,13 +405,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -435,13 +435,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -465,13 +465,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -495,13 +495,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -519,13 +519,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -549,13 +549,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -573,13 +573,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -603,13 +603,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -633,13 +633,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -663,13 +663,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -693,13 +693,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -723,13 +723,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -753,13 +753,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -783,13 +783,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -813,13 +813,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -837,13 +837,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -867,13 +867,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsExtLSet"></om:OMS>
       </om:OMA>
@@ -891,13 +891,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpDProd"></om:OMS>
       </om:OMA>
@@ -915,13 +915,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpEProd"></om:OMS>
       </om:OMA>
@@ -939,13 +939,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpDSum"></om:OMS>
       </om:OMA>
@@ -963,13 +963,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpESum"></om:OMS>
       </om:OMA>
@@ -987,13 +987,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsTrivialLOpEOne"></om:OMS>
       </om:OMA>
@@ -1011,13 +1011,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnByRing"></om:OMS>
       </om:OMA>
@@ -1035,13 +1035,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnByDivisionRing"></om:OMS>
       </om:OMA>
@@ -1059,13 +1059,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnByDivisionRing"></om:OMS>
       </om:OMA>
@@ -1083,13 +1083,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagma"></om:OMS>
       </om:OMA>
@@ -1107,13 +1107,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithOne"></om:OMS>
       </om:OMA>
@@ -1131,13 +1131,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithInversesIfNonzero"></om:OMS>
       </om:OMA>
@@ -1155,13 +1155,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsAssociative"></om:OMS>
       </om:OMA>
@@ -1179,13 +1179,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsAssociative"></om:OMS>
       </om:OMA>
@@ -1203,13 +1203,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsCommutative"></om:OMS>
       </om:OMA>
@@ -1227,13 +1227,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsCommutative"></om:OMS>
       </om:OMA>
@@ -1251,13 +1251,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="MultiplicativeNeutralElement"></om:OMS>
       </om:OMA>
@@ -1275,13 +1275,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsGeneratorsOfSemigroup"></om:OMS>
       </om:OMA>
@@ -1299,13 +1299,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsGeneratorsOfSemigroup"></om:OMS>
       </om:OMA>
@@ -1323,13 +1323,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsMonoidAsSemigroup"></om:OMS>
       </om:OMA>
@@ -1347,13 +1347,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsMonoidAsSemigroup"></om:OMS>
       </om:OMA>
@@ -1371,13 +1371,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagma"></om:OMS>
       </om:OMA>
@@ -1395,13 +1395,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagmaWithZero"></om:OMS>
       </om:OMA>
@@ -1419,13 +1419,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveGroup"></om:OMS>
       </om:OMA>
@@ -1443,13 +1443,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -1467,13 +1467,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -1491,13 +1491,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsLDistributive"></om:OMS>
       </om:OMA>
@@ -1515,13 +1515,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsLDistributive"></om:OMS>
       </om:OMA>
@@ -1539,13 +1539,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsRDistributive"></om:OMS>
       </om:OMA>
@@ -1563,13 +1563,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsRDistributive"></om:OMS>
       </om:OMA>
@@ -1587,13 +1587,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsUniqueFactorizationRing"></om:OMS>
       </om:OMA>
@@ -1611,13 +1611,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsEuclideanRing"></om:OMS>
       </om:OMA>
@@ -1635,13 +1635,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsIntegralRing"></om:OMS>
       </om:OMA>
@@ -1659,13 +1659,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsIntegralRing"></om:OMS>
       </om:OMA>
@@ -1683,13 +1683,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fldabnum" name="IsGaussianRationals"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFreeLeftModule"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/float.omdoc b/content/http..www.gap-system.org/lib/float.omdoc
index b033e42ff2e92ebee2c13346b7abcd2d8928fc04..2d734aa26d98dfca3147896cf475bf1b5e40ad6b 100644
--- a/content/http..www.gap-system.org/lib/float.omdoc
+++ b/content/http..www.gap-system.org/lib/float.omdoc
@@ -12,13 +12,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -36,13 +36,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -60,13 +60,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -84,13 +84,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -108,13 +108,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -132,13 +132,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -156,13 +156,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -180,13 +180,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -204,13 +204,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -228,13 +228,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -252,13 +252,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZDFRE"></om:OMS>
       </om:OMA>
@@ -276,13 +276,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsCommutativeElement"></om:OMS>
       </om:OMA>
@@ -291,7 +291,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?float"></import><import from="http://www.gap-system.org/lib?cyclotom"></import><constant name="AbsoluteValue">
+     </constant><import from="http://www.gap-system.org/lib?cyclotom"></import><constant name="AbsoluteValue">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
@@ -449,13 +449,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatInterval"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -473,13 +473,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatInterval"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -497,13 +497,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatInterval"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -521,13 +521,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatInterval"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -545,13 +545,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatInterval"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -569,13 +569,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatInterval"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -593,13 +593,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatInterval"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -617,13 +617,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatInterval"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -641,13 +641,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatInterval"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -665,13 +665,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatInterval"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -689,13 +689,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatInterval"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -713,13 +713,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatInterval"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -737,13 +737,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatInterval"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZDFRE"></om:OMS>
       </om:OMA>
@@ -761,13 +761,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatInterval"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsCommutativeElement"></om:OMS>
       </om:OMA>
@@ -785,13 +785,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatInterval"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloat"></om:OMS>
       </om:OMA>
@@ -814,13 +814,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsComplexFloat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -838,13 +838,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsComplexFloat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -862,13 +862,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsComplexFloat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -886,13 +886,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsComplexFloat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -910,13 +910,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsComplexFloat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -934,13 +934,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsComplexFloat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -958,13 +958,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsComplexFloat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -982,13 +982,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsComplexFloat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -1006,13 +1006,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsComplexFloat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -1030,13 +1030,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsComplexFloat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -1054,13 +1054,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsComplexFloat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZDFRE"></om:OMS>
       </om:OMA>
@@ -1078,13 +1078,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsComplexFloat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsCommutativeElement"></om:OMS>
       </om:OMA>
@@ -1102,13 +1102,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsComplexFloat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloat"></om:OMS>
       </om:OMA>
@@ -1131,13 +1131,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsComplexFloatInterval"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -1155,13 +1155,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsComplexFloatInterval"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -1179,13 +1179,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsComplexFloatInterval"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -1203,13 +1203,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsComplexFloatInterval"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -1227,13 +1227,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsComplexFloatInterval"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -1251,13 +1251,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsComplexFloatInterval"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -1275,13 +1275,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsComplexFloatInterval"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -1299,13 +1299,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsComplexFloatInterval"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -1323,13 +1323,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsComplexFloatInterval"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -1347,13 +1347,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsComplexFloatInterval"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -1371,13 +1371,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsComplexFloatInterval"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -1395,13 +1395,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsComplexFloatInterval"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -1419,13 +1419,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsComplexFloatInterval"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZDFRE"></om:OMS>
       </om:OMA>
@@ -1443,13 +1443,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsComplexFloatInterval"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsCommutativeElement"></om:OMS>
       </om:OMA>
@@ -1467,13 +1467,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsComplexFloatInterval"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloat"></om:OMS>
       </om:OMA>
@@ -1491,13 +1491,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsComplexFloatInterval"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatInterval"></om:OMS>
       </om:OMA>
@@ -1515,13 +1515,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsComplexFloatInterval"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsComplexFloat"></om:OMS>
       </om:OMA>
@@ -1616,13 +1616,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatPseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -1640,13 +1640,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatPseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -1664,13 +1664,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatPseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1688,13 +1688,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatPseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1712,13 +1712,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatPseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -1736,13 +1736,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatPseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1766,13 +1766,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatPseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1796,13 +1796,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatPseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1826,13 +1826,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatPseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1856,13 +1856,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatPseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1886,13 +1886,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatPseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -1910,13 +1910,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatPseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1940,13 +1940,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatPseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -1964,13 +1964,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatPseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1994,13 +1994,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatPseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2024,13 +2024,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatPseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -2048,13 +2048,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatPseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsExtLSet"></om:OMS>
       </om:OMA>
@@ -2072,13 +2072,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatPseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpDProd"></om:OMS>
       </om:OMA>
@@ -2096,13 +2096,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatPseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpEProd"></om:OMS>
       </om:OMA>
@@ -2120,13 +2120,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatPseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpDSum"></om:OMS>
       </om:OMA>
@@ -2144,13 +2144,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatPseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpESum"></om:OMS>
       </om:OMA>
@@ -2168,13 +2168,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatPseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsTrivialLOpEOne"></om:OMS>
       </om:OMA>
@@ -2192,13 +2192,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatPseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnByRing"></om:OMS>
       </om:OMA>
@@ -2216,13 +2216,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatPseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnByDivisionRing"></om:OMS>
       </om:OMA>
@@ -2240,13 +2240,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatPseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnByDivisionRing"></om:OMS>
       </om:OMA>
@@ -2264,13 +2264,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatPseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagma"></om:OMS>
       </om:OMA>
@@ -2288,13 +2288,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatPseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagma"></om:OMS>
       </om:OMA>
@@ -2312,13 +2312,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatPseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagmaWithZero"></om:OMS>
       </om:OMA>
@@ -2336,13 +2336,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatPseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveGroup"></om:OMS>
       </om:OMA>
@@ -2360,13 +2360,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatPseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -2384,13 +2384,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatPseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -2408,13 +2408,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatPseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsLDistributive"></om:OMS>
       </om:OMA>
@@ -2432,13 +2432,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatPseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsLDistributive"></om:OMS>
       </om:OMA>
@@ -2456,13 +2456,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatPseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsRDistributive"></om:OMS>
       </om:OMA>
@@ -2480,13 +2480,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatPseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsRDistributive"></om:OMS>
       </om:OMA>
@@ -2504,13 +2504,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatPseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFreeLeftModule"></om:OMS>
       </om:OMA>
@@ -2573,13 +2573,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatRationalFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -2597,13 +2597,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatRationalFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -2621,13 +2621,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatRationalFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -2645,13 +2645,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatRationalFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -2669,13 +2669,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatRationalFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -2693,13 +2693,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatRationalFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -2717,13 +2717,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatRationalFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -2741,13 +2741,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatRationalFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -2765,13 +2765,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatRationalFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -2789,13 +2789,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatRationalFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -2813,13 +2813,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatRationalFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZDFRE"></om:OMS>
       </om:OMA>
@@ -2837,13 +2837,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatRationalFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialFunction"></om:OMS>
       </om:OMA>
@@ -2861,13 +2861,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatRationalFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunction"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/fpmon.omdoc b/content/http..www.gap-system.org/lib/fpmon.omdoc
index 17d8da5f927816466ea900f97b09153c2e2fedab..7723adace63e3f02ef3e14aeb04bc98cfe4e6b88 100644
--- a/content/http..www.gap-system.org/lib/fpmon.omdoc
+++ b/content/http..www.gap-system.org/lib/fpmon.omdoc
@@ -12,13 +12,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fpmon" name="IsElementOfFpMonoid"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -36,13 +36,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fpmon" name="IsElementOfFpMonoid"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -60,13 +60,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fpmon" name="IsElementOfFpMonoid"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -84,13 +84,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fpmon" name="IsElementOfFpMonoid"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -108,13 +108,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fpmon" name="IsElementOfFpMonoid"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -123,7 +123,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?coll"></import><import from="http://www.gap-system.org/lib?magma"></import><import from="http://www.gap-system.org/lib?fpmon"></import><constant name="FreeGeneratorsOfFpMonoid">
+     </constant><import from="http://www.gap-system.org/lib?coll"></import><import from="http://www.gap-system.org/lib?magma"></import><constant name="FreeGeneratorsOfFpMonoid">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
diff --git a/content/http..www.gap-system.org/lib/fpsemi.omdoc b/content/http..www.gap-system.org/lib/fpsemi.omdoc
index c2f12ade10869a404c6fd402da591856f6546f76..13097db4a99bab2e09a9ea177747a3f7d8af87a6 100644
--- a/content/http..www.gap-system.org/lib/fpsemi.omdoc
+++ b/content/http..www.gap-system.org/lib/fpsemi.omdoc
@@ -12,13 +12,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fpsemi" name="IsElementOfFpSemigroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -36,13 +36,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fpsemi" name="IsElementOfFpSemigroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -60,13 +60,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fpsemi" name="IsElementOfFpSemigroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -84,13 +84,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="fpsemi" name="IsElementOfFpSemigroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -99,7 +99,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?fpsemi"></import><import from="http://www.gap-system.org/lib?word"></import><constant name="ElementOfFpSemigroup">
+     </constant><import from="http://www.gap-system.org/lib?word"></import><constant name="ElementOfFpSemigroup">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
diff --git a/content/http..www.gap-system.org/lib/function.omdoc b/content/http..www.gap-system.org/lib/function.omdoc
index dea63c106a2fa8fe7d2032d50089a2f5b363316f..133c09b6d5b87e7e6c421873c2c20a70cf42eacd 100644
--- a/content/http..www.gap-system.org/lib/function.omdoc
+++ b/content/http..www.gap-system.org/lib/function.omdoc
@@ -11,7 +11,7 @@
       </om:OMA></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?function"></import><constant name="IsOperation">
+     </constant><constant name="IsOperation">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="category"></om:OMS></om:OMOBJ></type>
        
@@ -25,13 +25,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="function" name="IsOperation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="function" name="IsFunction"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/gaussian.omdoc b/content/http..www.gap-system.org/lib/gaussian.omdoc
index 013e636e742e5d61dcb734109ce637969da2694b..a09a8c755612c2b359755cd6b551f805c7c61b39 100644
--- a/content/http..www.gap-system.org/lib/gaussian.omdoc
+++ b/content/http..www.gap-system.org/lib/gaussian.omdoc
@@ -12,10 +12,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gaussian" name="IsCanonicalBasisGaussianIntegersRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gaussian" name="IsCanonicalBasisGaussianIntegersRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -30,10 +30,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gaussian" name="IsCanonicalBasisGaussianIntegersRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gaussian" name="IsCanonicalBasisGaussianIntegersRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/ghom.omdoc b/content/http..www.gap-system.org/lib/ghom.omdoc
index 98fd17da966e6908fa84e59be90c6564ee45cb6e..4cd5aea6f7d3d17e908fb0d221ce9434955a38af 100644
--- a/content/http..www.gap-system.org/lib/ghom.omdoc
+++ b/content/http..www.gap-system.org/lib/ghom.omdoc
@@ -12,10 +12,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -30,10 +30,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -48,10 +48,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -69,10 +69,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -90,10 +90,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -111,10 +111,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -132,10 +132,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -153,10 +153,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -174,10 +174,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -195,10 +195,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSPGeneralMapping"></om:OMS>
       </om:OMA>
@@ -216,10 +216,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -237,10 +237,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -258,10 +258,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -279,10 +279,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -300,10 +300,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -321,10 +321,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -341,7 +341,7 @@
       </om:OMA></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?ghom"></import><constant name="IsConjugatorAutomorphism">
+     </constant><constant name="IsConjugatorAutomorphism">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="filter"></om:OMS></om:OMOBJ></type>
        <definition><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
@@ -381,10 +381,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -399,10 +399,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -417,10 +417,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -438,10 +438,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -459,10 +459,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -480,10 +480,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -501,10 +501,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -522,10 +522,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -543,10 +543,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -564,10 +564,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSPGeneralMapping"></om:OMS>
       </om:OMA>
@@ -585,10 +585,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -606,10 +606,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -627,10 +627,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -648,10 +648,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -669,10 +669,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -690,10 +690,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -820,10 +820,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByAsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByAsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -838,10 +838,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByAsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByAsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -856,10 +856,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByAsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByAsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -877,10 +877,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByAsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByAsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -898,10 +898,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByAsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByAsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -919,10 +919,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByAsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByAsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -940,10 +940,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByAsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByAsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -961,10 +961,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByAsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByAsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -982,10 +982,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByAsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByAsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -1003,10 +1003,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByAsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByAsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSPGeneralMapping"></om:OMS>
       </om:OMA>
@@ -1024,10 +1024,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByAsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByAsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -1045,10 +1045,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByAsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByAsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -1066,10 +1066,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByAsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByAsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -1087,10 +1087,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByAsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByAsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -1108,10 +1108,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByAsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByAsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -1129,10 +1129,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByAsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByAsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -1150,10 +1150,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByAsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByAsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/ghomfp.omdoc b/content/http..www.gap-system.org/lib/ghomfp.omdoc
index d6cc452dc1c186ff8b65786bdc2cb2ceb86c29a6..1300fedf372fcbe368e32c6c7fe808fd3a7be215 100644
--- a/content/http..www.gap-system.org/lib/ghomfp.omdoc
+++ b/content/http..www.gap-system.org/lib/ghomfp.omdoc
@@ -3,7 +3,7 @@
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="filter"></om:OMS></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?arith"></import><import from="http://www.gap-system.org/lib?mapping"></import><import from="http://www.gap-system.org/lib?mapphomo"></import><import from="http://www.gap-system.org/lib?ghomfp"></import><constant name="IsFromFpGroupGeneralMapping">
+     </constant><import from="http://www.gap-system.org/lib?arith"></import><import from="http://www.gap-system.org/lib?mapping"></import><import from="http://www.gap-system.org/lib?mapphomo"></import><constant name="IsFromFpGroupGeneralMapping">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="category"></om:OMS></om:OMOBJ></type>
        
@@ -17,13 +17,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMapping"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -41,13 +41,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMapping"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -65,13 +65,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMapping"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -89,13 +89,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMapping"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -113,13 +113,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMapping"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -137,13 +137,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMapping"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -161,13 +161,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMapping"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -185,13 +185,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMapping"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -209,13 +209,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMapping"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -233,13 +233,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMapping"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -257,13 +257,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMapping"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -281,13 +281,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMapping"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -305,13 +305,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMapping"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -329,13 +329,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMapping"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="Extrarankfilter"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="Extrarankfilter"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -355,10 +355,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -373,10 +373,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -391,10 +391,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -412,10 +412,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -433,10 +433,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -454,10 +454,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -475,10 +475,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -496,10 +496,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -517,10 +517,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -538,10 +538,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSPGeneralMapping"></om:OMS>
       </om:OMA>
@@ -559,10 +559,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -580,10 +580,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -601,10 +601,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -622,10 +622,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -643,10 +643,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -664,10 +664,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -685,10 +685,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -703,10 +703,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="Extrarankfilter"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="Extrarankfilter"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -721,10 +721,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMapping"></om:OMS>
       </om:OMA>
@@ -747,10 +747,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupStdGensGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupStdGensGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -765,10 +765,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupStdGensGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupStdGensGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -783,10 +783,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupStdGensGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupStdGensGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -804,10 +804,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupStdGensGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupStdGensGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -825,10 +825,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupStdGensGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupStdGensGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -846,10 +846,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupStdGensGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupStdGensGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -867,10 +867,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupStdGensGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupStdGensGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -888,10 +888,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupStdGensGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupStdGensGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -909,10 +909,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupStdGensGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupStdGensGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -930,10 +930,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupStdGensGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupStdGensGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSPGeneralMapping"></om:OMS>
       </om:OMA>
@@ -951,10 +951,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupStdGensGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupStdGensGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -972,10 +972,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupStdGensGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupStdGensGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -993,10 +993,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupStdGensGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupStdGensGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -1014,10 +1014,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupStdGensGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupStdGensGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -1035,10 +1035,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupStdGensGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupStdGensGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -1056,10 +1056,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupStdGensGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupStdGensGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -1077,10 +1077,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupStdGensGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupStdGensGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1095,10 +1095,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupStdGensGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupStdGensGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="Extrarankfilter"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="Extrarankfilter"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1113,10 +1113,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupStdGensGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupStdGensGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMapping"></om:OMS>
       </om:OMA>
@@ -1134,10 +1134,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupStdGensGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupStdGensGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsFromFpGroupGeneralMappingByImages"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1192,10 +1192,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsToFpGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsToFpGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1210,10 +1210,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsToFpGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsToFpGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1228,10 +1228,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsToFpGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsToFpGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -1249,10 +1249,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsToFpGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsToFpGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -1270,10 +1270,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsToFpGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsToFpGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -1291,10 +1291,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsToFpGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsToFpGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -1312,10 +1312,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsToFpGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsToFpGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -1333,10 +1333,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsToFpGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsToFpGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -1354,10 +1354,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsToFpGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsToFpGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -1375,10 +1375,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsToFpGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsToFpGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSPGeneralMapping"></om:OMS>
       </om:OMA>
@@ -1396,10 +1396,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsToFpGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsToFpGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -1417,10 +1417,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsToFpGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsToFpGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -1438,10 +1438,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsToFpGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsToFpGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -1459,10 +1459,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsToFpGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsToFpGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -1480,10 +1480,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsToFpGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsToFpGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -1501,10 +1501,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsToFpGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsToFpGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -1522,10 +1522,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsToFpGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsToFpGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1650,10 +1650,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsModuloPcgsFpGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsModuloPcgsFpGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsList"></om:OMS>
       </om:OMA>
@@ -1671,10 +1671,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsModuloPcgsFpGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsModuloPcgsFpGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDenseList"></om:OMS>
       </om:OMA>
@@ -1692,10 +1692,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsModuloPcgsFpGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsModuloPcgsFpGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsHomogeneousList"></om:OMS>
       </om:OMA>
@@ -1713,10 +1713,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsModuloPcgsFpGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsModuloPcgsFpGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oper" name="IsNoImmediateMethodsObject"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oper" name="IsNoImmediateMethodsObject"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1731,10 +1731,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsModuloPcgsFpGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsModuloPcgsFpGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1749,10 +1749,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsModuloPcgsFpGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsModuloPcgsFpGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1767,10 +1767,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsModuloPcgsFpGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsModuloPcgsFpGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -1788,10 +1788,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsModuloPcgsFpGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsModuloPcgsFpGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -1809,10 +1809,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsModuloPcgsFpGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsModuloPcgsFpGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsFinite"></om:OMS>
       </om:OMA>
@@ -1830,10 +1830,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsModuloPcgsFpGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsModuloPcgsFpGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsFinite"></om:OMS>
       </om:OMA>
@@ -1851,10 +1851,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsModuloPcgsFpGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsModuloPcgsFpGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsConstantTimeAccessList"></om:OMS>
       </om:OMA>
@@ -1872,10 +1872,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsModuloPcgsFpGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsModuloPcgsFpGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1893,10 +1893,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsModuloPcgsFpGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsModuloPcgsFpGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1914,10 +1914,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsModuloPcgsFpGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsModuloPcgsFpGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -1935,10 +1935,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsModuloPcgsFpGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsModuloPcgsFpGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1962,10 +1962,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsModuloPcgsFpGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsModuloPcgsFpGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -1983,10 +1983,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsModuloPcgsFpGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsModuloPcgsFpGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2010,10 +2010,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsModuloPcgsFpGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsModuloPcgsFpGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2037,10 +2037,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsModuloPcgsFpGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsModuloPcgsFpGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2064,10 +2064,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsModuloPcgsFpGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsModuloPcgsFpGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2091,10 +2091,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsModuloPcgsFpGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsModuloPcgsFpGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsGeneralPcgs"></om:OMS>
       </om:OMA>
@@ -2112,10 +2112,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsModuloPcgsFpGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsModuloPcgsFpGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsModuloPcgs"></om:OMS>
       </om:OMA>
@@ -2133,10 +2133,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsModuloPcgsFpGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomfp" name="IsModuloPcgsFpGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgsDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgsDefaultRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/ghompcgs.omdoc b/content/http..www.gap-system.org/lib/ghompcgs.omdoc
index 5bccfd083f5eaa5762369d81ff92f6793e250fba..f7a71fabfca6bd9bbf85d72f40e8b54b67d67249 100644
--- a/content/http..www.gap-system.org/lib/ghompcgs.omdoc
+++ b/content/http..www.gap-system.org/lib/ghompcgs.omdoc
@@ -12,10 +12,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsToPcGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsToPcGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -30,10 +30,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsToPcGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsToPcGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -48,10 +48,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsToPcGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsToPcGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -69,10 +69,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsToPcGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsToPcGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -90,10 +90,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsToPcGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsToPcGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -111,10 +111,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsToPcGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsToPcGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -132,10 +132,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsToPcGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsToPcGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -153,10 +153,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsToPcGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsToPcGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -174,10 +174,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsToPcGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsToPcGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -195,10 +195,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsToPcGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsToPcGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSPGeneralMapping"></om:OMS>
       </om:OMA>
@@ -216,10 +216,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsToPcGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsToPcGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -237,10 +237,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsToPcGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsToPcGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -258,10 +258,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsToPcGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsToPcGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -279,10 +279,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsToPcGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsToPcGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -300,10 +300,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsToPcGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsToPcGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -321,10 +321,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsToPcGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsToPcGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -342,16 +342,16 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsToPcGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsToPcGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?ghompcgs"></import><constant name="IsToPcGroupHomomorphismByImages">
+     </constant><constant name="IsToPcGroupHomomorphismByImages">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="filter"></om:OMS></om:OMOBJ></type>
        <definition><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
@@ -400,10 +400,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsGroupGeneralMappingByPcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsGroupGeneralMappingByPcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -418,10 +418,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsGroupGeneralMappingByPcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsGroupGeneralMappingByPcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -436,10 +436,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsGroupGeneralMappingByPcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsGroupGeneralMappingByPcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -457,10 +457,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsGroupGeneralMappingByPcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsGroupGeneralMappingByPcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -478,10 +478,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsGroupGeneralMappingByPcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsGroupGeneralMappingByPcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -499,10 +499,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsGroupGeneralMappingByPcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsGroupGeneralMappingByPcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -520,10 +520,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsGroupGeneralMappingByPcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsGroupGeneralMappingByPcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -541,10 +541,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsGroupGeneralMappingByPcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsGroupGeneralMappingByPcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -562,10 +562,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsGroupGeneralMappingByPcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsGroupGeneralMappingByPcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -583,10 +583,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsGroupGeneralMappingByPcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsGroupGeneralMappingByPcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSPGeneralMapping"></om:OMS>
       </om:OMA>
@@ -604,10 +604,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsGroupGeneralMappingByPcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsGroupGeneralMappingByPcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -625,10 +625,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsGroupGeneralMappingByPcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsGroupGeneralMappingByPcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -646,10 +646,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsGroupGeneralMappingByPcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsGroupGeneralMappingByPcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -667,10 +667,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsGroupGeneralMappingByPcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsGroupGeneralMappingByPcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -688,10 +688,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsGroupGeneralMappingByPcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsGroupGeneralMappingByPcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -709,10 +709,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsGroupGeneralMappingByPcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsGroupGeneralMappingByPcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -730,10 +730,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsGroupGeneralMappingByPcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsGroupGeneralMappingByPcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -753,10 +753,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -771,10 +771,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -789,10 +789,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -810,10 +810,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -831,10 +831,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -852,10 +852,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -873,10 +873,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -894,10 +894,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -915,10 +915,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -936,10 +936,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSPGeneralMapping"></om:OMS>
       </om:OMA>
@@ -957,10 +957,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -978,10 +978,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -999,10 +999,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -1020,10 +1020,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -1041,10 +1041,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -1062,10 +1062,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -1083,10 +1083,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1101,10 +1101,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsGroupGeneralMappingByPcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsGroupGeneralMappingByPcgs"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1124,10 +1124,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcgsToPcgsGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcgsToPcgsGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1142,10 +1142,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcgsToPcgsGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcgsToPcgsGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1160,10 +1160,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcgsToPcgsGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcgsToPcgsGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -1181,10 +1181,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcgsToPcgsGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcgsToPcgsGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -1202,10 +1202,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcgsToPcgsGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcgsToPcgsGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -1223,10 +1223,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcgsToPcgsGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcgsToPcgsGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -1244,10 +1244,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcgsToPcgsGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcgsToPcgsGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -1265,10 +1265,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcgsToPcgsGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcgsToPcgsGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -1286,10 +1286,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcgsToPcgsGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcgsToPcgsGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -1307,10 +1307,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcgsToPcgsGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcgsToPcgsGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSPGeneralMapping"></om:OMS>
       </om:OMA>
@@ -1328,10 +1328,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcgsToPcgsGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcgsToPcgsGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -1349,10 +1349,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcgsToPcgsGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcgsToPcgsGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -1370,10 +1370,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcgsToPcgsGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcgsToPcgsGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -1391,10 +1391,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcgsToPcgsGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcgsToPcgsGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -1412,10 +1412,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcgsToPcgsGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcgsToPcgsGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -1433,10 +1433,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcgsToPcgsGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcgsToPcgsGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -1454,10 +1454,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcgsToPcgsGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcgsToPcgsGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1472,10 +1472,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcgsToPcgsGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcgsToPcgsGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsGroupGeneralMappingByPcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsGroupGeneralMappingByPcgs"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1490,10 +1490,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcgsToPcgsGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcgsToPcgsGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcGroupGeneralMappingByImages"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1508,10 +1508,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcgsToPcgsGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsPcgsToPcgsGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsToPcGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsToPcGroupGeneralMappingByImages"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1531,10 +1531,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsNaturalHomomorphismPcGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsNaturalHomomorphismPcGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1549,10 +1549,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsNaturalHomomorphismPcGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsNaturalHomomorphismPcGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1567,10 +1567,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsNaturalHomomorphismPcGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsNaturalHomomorphismPcGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -1588,10 +1588,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsNaturalHomomorphismPcGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsNaturalHomomorphismPcGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -1609,10 +1609,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsNaturalHomomorphismPcGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsNaturalHomomorphismPcGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -1630,10 +1630,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsNaturalHomomorphismPcGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsNaturalHomomorphismPcGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -1651,10 +1651,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsNaturalHomomorphismPcGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsNaturalHomomorphismPcGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -1672,10 +1672,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsNaturalHomomorphismPcGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsNaturalHomomorphismPcGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -1693,10 +1693,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsNaturalHomomorphismPcGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsNaturalHomomorphismPcGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -1714,10 +1714,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsNaturalHomomorphismPcGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsNaturalHomomorphismPcGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSPGeneralMapping"></om:OMS>
       </om:OMA>
@@ -1735,10 +1735,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsNaturalHomomorphismPcGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsNaturalHomomorphismPcGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -1756,10 +1756,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsNaturalHomomorphismPcGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsNaturalHomomorphismPcGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -1777,10 +1777,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsNaturalHomomorphismPcGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsNaturalHomomorphismPcGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -1798,10 +1798,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsNaturalHomomorphismPcGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsNaturalHomomorphismPcGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -1819,10 +1819,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsNaturalHomomorphismPcGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsNaturalHomomorphismPcGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSurjective"></om:OMS>
       </om:OMA>
@@ -1840,10 +1840,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsNaturalHomomorphismPcGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsNaturalHomomorphismPcGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSurjective"></om:OMS>
       </om:OMA>
@@ -1861,10 +1861,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsNaturalHomomorphismPcGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsNaturalHomomorphismPcGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -1882,10 +1882,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsNaturalHomomorphismPcGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsNaturalHomomorphismPcGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -1903,10 +1903,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsNaturalHomomorphismPcGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsNaturalHomomorphismPcGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -1924,10 +1924,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsNaturalHomomorphismPcGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsNaturalHomomorphismPcGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -1945,10 +1945,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsNaturalHomomorphismPcGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsNaturalHomomorphismPcGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -1966,10 +1966,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsNaturalHomomorphismPcGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghompcgs" name="IsNaturalHomomorphismPcGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/ghomperm.omdoc b/content/http..www.gap-system.org/lib/ghomperm.omdoc
index 6534c1a9053fb947785464c038b67ecd6124e28c..590d139dcb57aa2b93c0f984a434c0edc71f79fc 100644
--- a/content/http..www.gap-system.org/lib/ghomperm.omdoc
+++ b/content/http..www.gap-system.org/lib/ghomperm.omdoc
@@ -12,10 +12,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsBlocksOfActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsBlocksOfActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -30,10 +30,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsBlocksOfActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsBlocksOfActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -48,10 +48,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsBlocksOfActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsBlocksOfActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -69,10 +69,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsBlocksOfActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsBlocksOfActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -90,10 +90,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsBlocksOfActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsBlocksOfActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -111,10 +111,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsBlocksOfActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsBlocksOfActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -132,10 +132,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsBlocksOfActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsBlocksOfActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -153,10 +153,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsBlocksOfActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsBlocksOfActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -174,10 +174,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsBlocksOfActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsBlocksOfActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -195,10 +195,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsBlocksOfActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsBlocksOfActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSPGeneralMapping"></om:OMS>
       </om:OMA>
@@ -216,10 +216,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsBlocksOfActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsBlocksOfActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -237,10 +237,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsBlocksOfActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsBlocksOfActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -258,10 +258,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsBlocksOfActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsBlocksOfActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -279,10 +279,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsBlocksOfActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsBlocksOfActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -300,10 +300,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsBlocksOfActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsBlocksOfActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -321,10 +321,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsBlocksOfActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsBlocksOfActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -342,10 +342,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsBlocksOfActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsBlocksOfActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -363,10 +363,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsBlocksOfActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsBlocksOfActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -384,10 +384,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsBlocksOfActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsBlocksOfActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -405,10 +405,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsBlocksOfActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsBlocksOfActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -426,10 +426,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsBlocksOfActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsBlocksOfActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -444,10 +444,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsBlocksOfActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsBlocksOfActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -462,10 +462,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsBlocksOfActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsBlocksOfActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByBase"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByBase"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -485,10 +485,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMapping"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMapping"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -506,10 +506,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMapping"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMapping"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -527,10 +527,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMapping"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMapping"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -548,10 +548,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMapping"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMapping"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -569,10 +569,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMapping"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMapping"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -590,10 +590,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMapping"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMapping"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -611,10 +611,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMapping"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMapping"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -632,10 +632,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMapping"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMapping"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -653,10 +653,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMapping"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMapping"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -674,10 +674,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMapping"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMapping"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -695,10 +695,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMapping"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMapping"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -716,10 +716,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMapping"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMapping"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -737,10 +737,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMapping"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMapping"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -749,7 +749,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?ghomperm"></import><constant name="IsPermGroupGeneralMappingByImages">
+     </constant><constant name="IsPermGroupGeneralMappingByImages">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="filter"></om:OMS></om:OMOBJ></type>
        
@@ -763,10 +763,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -781,10 +781,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -799,10 +799,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -820,10 +820,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -841,10 +841,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -862,10 +862,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -883,10 +883,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -904,10 +904,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -925,10 +925,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -946,10 +946,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSPGeneralMapping"></om:OMS>
       </om:OMA>
@@ -967,10 +967,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -988,10 +988,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -1009,10 +1009,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -1030,10 +1030,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -1051,10 +1051,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -1072,10 +1072,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -1093,10 +1093,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1111,10 +1111,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMapping"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsPermGroupGeneralMapping"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1134,10 +1134,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsToPermGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsToPermGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1152,10 +1152,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsToPermGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsToPermGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1170,10 +1170,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsToPermGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsToPermGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -1191,10 +1191,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsToPermGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsToPermGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -1212,10 +1212,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsToPermGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsToPermGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -1233,10 +1233,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsToPermGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsToPermGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -1254,10 +1254,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsToPermGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsToPermGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -1275,10 +1275,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsToPermGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsToPermGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -1296,10 +1296,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsToPermGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsToPermGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -1317,10 +1317,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsToPermGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsToPermGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSPGeneralMapping"></om:OMS>
       </om:OMA>
@@ -1338,10 +1338,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsToPermGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsToPermGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -1359,10 +1359,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsToPermGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsToPermGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -1380,10 +1380,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsToPermGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsToPermGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -1401,10 +1401,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsToPermGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsToPermGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -1422,10 +1422,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsToPermGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsToPermGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -1443,10 +1443,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsToPermGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsToPermGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -1464,10 +1464,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsToPermGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghomperm" name="IsToPermGroupGeneralMappingByImages"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/gprd.omdoc b/content/http..www.gap-system.org/lib/gprd.omdoc
index a867449a4564b0d34065621117bb0cc0ef3a0219..39eb47b08788eb9f70dd83fa804ad2ac2434856e 100644
--- a/content/http..www.gap-system.org/lib/gprd.omdoc
+++ b/content/http..www.gap-system.org/lib/gprd.omdoc
@@ -20,10 +20,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprd" name="IsPcgsDirectProductRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprd" name="IsPcgsDirectProductRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -38,10 +38,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprd" name="IsPcgsDirectProductRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprd" name="IsPcgsDirectProductRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -56,10 +56,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprd" name="IsPcgsDirectProductRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprd" name="IsPcgsDirectProductRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgsDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgsDefaultRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -87,13 +87,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="gprd" name="IsWreathProductElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -111,13 +111,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="gprd" name="IsWreathProductElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -135,13 +135,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="gprd" name="IsWreathProductElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -159,13 +159,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="gprd" name="IsWreathProductElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -183,13 +183,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="gprd" name="IsWreathProductElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -207,13 +207,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="gprd" name="IsWreathProductElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -294,7 +294,7 @@
       </om:OMA></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?gprd"></import><constant name="IsWreathProductElementDefaultRep">
+     </constant><constant name="IsWreathProductElementDefaultRep">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="filter"></om:OMS></om:OMOBJ></type>
        
@@ -308,10 +308,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprd" name="IsWreathProductElementDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprd" name="IsWreathProductElementDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -326,10 +326,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprd" name="IsWreathProductElementDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprd" name="IsWreathProductElementDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -347,10 +347,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprd" name="IsWreathProductElementDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprd" name="IsWreathProductElementDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -368,10 +368,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprd" name="IsWreathProductElementDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprd" name="IsWreathProductElementDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -389,10 +389,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprd" name="IsWreathProductElementDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprd" name="IsWreathProductElementDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -410,10 +410,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprd" name="IsWreathProductElementDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprd" name="IsWreathProductElementDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -431,10 +431,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprd" name="IsWreathProductElementDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprd" name="IsWreathProductElementDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -452,10 +452,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprd" name="IsWreathProductElementDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprd" name="IsWreathProductElementDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="gprd" name="IsWreathProductElement"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/gprdmat.omdoc b/content/http..www.gap-system.org/lib/gprdmat.omdoc
index d1e711ab3f5a65c6defaeb1b95efe8a6f3a306b8..9724c329e27498d745dbaea56f8eec5105dac1b0 100644
--- a/content/http..www.gap-system.org/lib/gprdmat.omdoc
+++ b/content/http..www.gap-system.org/lib/gprdmat.omdoc
@@ -12,10 +12,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingDirectProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingDirectProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -30,10 +30,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingDirectProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingDirectProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -48,10 +48,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingDirectProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingDirectProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -69,10 +69,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingDirectProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingDirectProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -90,10 +90,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingDirectProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingDirectProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -111,10 +111,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingDirectProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingDirectProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -132,10 +132,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingDirectProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingDirectProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -153,10 +153,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingDirectProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingDirectProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -174,10 +174,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingDirectProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingDirectProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -195,10 +195,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingDirectProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingDirectProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSPGeneralMapping"></om:OMS>
       </om:OMA>
@@ -216,10 +216,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingDirectProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingDirectProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -237,10 +237,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingDirectProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingDirectProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -258,10 +258,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingDirectProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingDirectProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -279,10 +279,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingDirectProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingDirectProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -300,10 +300,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingDirectProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingDirectProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsInjective"></om:OMS>
       </om:OMA>
@@ -321,10 +321,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingDirectProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingDirectProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsInjective"></om:OMS>
       </om:OMA>
@@ -342,10 +342,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingDirectProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingDirectProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -363,10 +363,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingDirectProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingDirectProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -384,10 +384,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingDirectProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingDirectProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -405,10 +405,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingDirectProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingDirectProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -426,10 +426,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingDirectProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingDirectProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -447,10 +447,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingDirectProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingDirectProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -473,10 +473,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsProjectionDirectProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsProjectionDirectProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -491,10 +491,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsProjectionDirectProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsProjectionDirectProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -509,10 +509,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsProjectionDirectProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsProjectionDirectProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -530,10 +530,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsProjectionDirectProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsProjectionDirectProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -551,10 +551,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsProjectionDirectProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsProjectionDirectProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -572,10 +572,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsProjectionDirectProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsProjectionDirectProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -593,10 +593,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsProjectionDirectProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsProjectionDirectProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -614,10 +614,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsProjectionDirectProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsProjectionDirectProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -635,10 +635,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsProjectionDirectProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsProjectionDirectProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -656,10 +656,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsProjectionDirectProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsProjectionDirectProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSPGeneralMapping"></om:OMS>
       </om:OMA>
@@ -677,10 +677,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsProjectionDirectProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsProjectionDirectProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -698,10 +698,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsProjectionDirectProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsProjectionDirectProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -719,10 +719,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsProjectionDirectProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsProjectionDirectProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -740,10 +740,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsProjectionDirectProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsProjectionDirectProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -761,10 +761,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsProjectionDirectProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsProjectionDirectProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSurjective"></om:OMS>
       </om:OMA>
@@ -782,10 +782,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsProjectionDirectProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsProjectionDirectProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSurjective"></om:OMS>
       </om:OMA>
@@ -803,10 +803,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsProjectionDirectProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsProjectionDirectProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -824,10 +824,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsProjectionDirectProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsProjectionDirectProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -845,10 +845,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsProjectionDirectProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsProjectionDirectProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -866,10 +866,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsProjectionDirectProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsProjectionDirectProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -887,10 +887,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsProjectionDirectProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsProjectionDirectProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -908,10 +908,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsProjectionDirectProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsProjectionDirectProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -934,10 +934,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingImprimitiveWreathProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingImprimitiveWreathProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -952,10 +952,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingImprimitiveWreathProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingImprimitiveWreathProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -970,10 +970,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingImprimitiveWreathProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingImprimitiveWreathProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -991,10 +991,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingImprimitiveWreathProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingImprimitiveWreathProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -1012,10 +1012,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingImprimitiveWreathProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingImprimitiveWreathProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -1033,10 +1033,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingImprimitiveWreathProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingImprimitiveWreathProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -1054,10 +1054,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingImprimitiveWreathProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingImprimitiveWreathProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -1075,10 +1075,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingImprimitiveWreathProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingImprimitiveWreathProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -1096,10 +1096,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingImprimitiveWreathProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingImprimitiveWreathProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -1117,10 +1117,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingImprimitiveWreathProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingImprimitiveWreathProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSPGeneralMapping"></om:OMS>
       </om:OMA>
@@ -1138,10 +1138,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingImprimitiveWreathProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingImprimitiveWreathProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -1159,10 +1159,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingImprimitiveWreathProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingImprimitiveWreathProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -1180,10 +1180,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingImprimitiveWreathProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingImprimitiveWreathProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -1201,10 +1201,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingImprimitiveWreathProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingImprimitiveWreathProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -1222,10 +1222,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingImprimitiveWreathProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingImprimitiveWreathProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsInjective"></om:OMS>
       </om:OMA>
@@ -1243,10 +1243,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingImprimitiveWreathProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingImprimitiveWreathProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsInjective"></om:OMS>
       </om:OMA>
@@ -1264,10 +1264,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingImprimitiveWreathProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingImprimitiveWreathProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -1285,10 +1285,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingImprimitiveWreathProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingImprimitiveWreathProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -1306,10 +1306,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingImprimitiveWreathProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingImprimitiveWreathProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -1327,10 +1327,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingImprimitiveWreathProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingImprimitiveWreathProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -1348,10 +1348,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingImprimitiveWreathProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingImprimitiveWreathProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -1369,10 +1369,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingImprimitiveWreathProductMatrixGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdmat" name="IsEmbeddingImprimitiveWreathProductMatrixGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/gprdperm.omdoc b/content/http..www.gap-system.org/lib/gprdperm.omdoc
index 87f6719dc15bccab47e176ddf2f3ccb34e25997c..adcd753af01da03c94f29e7923135f5442b191a9 100644
--- a/content/http..www.gap-system.org/lib/gprdperm.omdoc
+++ b/content/http..www.gap-system.org/lib/gprdperm.omdoc
@@ -12,10 +12,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingDirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingDirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -30,10 +30,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingDirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingDirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -48,10 +48,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingDirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingDirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -69,10 +69,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingDirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingDirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -90,10 +90,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingDirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingDirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -111,10 +111,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingDirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingDirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -132,10 +132,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingDirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingDirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -153,10 +153,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingDirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingDirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -174,10 +174,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingDirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingDirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -195,10 +195,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingDirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingDirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSPGeneralMapping"></om:OMS>
       </om:OMA>
@@ -216,10 +216,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingDirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingDirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -237,10 +237,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingDirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingDirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -258,10 +258,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingDirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingDirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -279,10 +279,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingDirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingDirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -300,10 +300,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingDirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingDirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsInjective"></om:OMS>
       </om:OMA>
@@ -321,10 +321,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingDirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingDirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsInjective"></om:OMS>
       </om:OMA>
@@ -342,10 +342,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingDirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingDirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -363,10 +363,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingDirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingDirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -384,10 +384,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingDirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingDirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -405,10 +405,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingDirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingDirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -426,10 +426,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingDirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingDirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -447,10 +447,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingDirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingDirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -473,10 +473,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionDirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionDirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -491,10 +491,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionDirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionDirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -509,10 +509,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionDirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionDirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -530,10 +530,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionDirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionDirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -551,10 +551,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionDirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionDirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -572,10 +572,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionDirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionDirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -593,10 +593,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionDirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionDirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -614,10 +614,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionDirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionDirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -635,10 +635,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionDirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionDirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -656,10 +656,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionDirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionDirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSPGeneralMapping"></om:OMS>
       </om:OMA>
@@ -677,10 +677,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionDirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionDirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -698,10 +698,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionDirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionDirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -719,10 +719,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionDirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionDirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -740,10 +740,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionDirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionDirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -761,10 +761,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionDirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionDirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSurjective"></om:OMS>
       </om:OMA>
@@ -782,10 +782,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionDirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionDirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSurjective"></om:OMS>
       </om:OMA>
@@ -803,10 +803,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionDirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionDirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -824,10 +824,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionDirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionDirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -845,10 +845,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionDirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionDirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -866,10 +866,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionDirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionDirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -887,10 +887,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionDirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionDirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -908,10 +908,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionDirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionDirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -934,10 +934,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -952,10 +952,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -970,10 +970,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -991,10 +991,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -1012,10 +1012,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -1033,10 +1033,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -1054,10 +1054,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -1075,10 +1075,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -1096,10 +1096,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -1117,10 +1117,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSPGeneralMapping"></om:OMS>
       </om:OMA>
@@ -1138,10 +1138,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -1159,10 +1159,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -1180,10 +1180,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -1201,10 +1201,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -1222,10 +1222,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsInjective"></om:OMS>
       </om:OMA>
@@ -1243,10 +1243,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsInjective"></om:OMS>
       </om:OMA>
@@ -1264,10 +1264,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -1285,10 +1285,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -1306,10 +1306,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -1327,10 +1327,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -1348,10 +1348,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -1369,10 +1369,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -1381,7 +1381,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?gprdperm"></import><constant name="IsEmbeddingImprimitiveWreathProductPermGroup">
+     </constant><constant name="IsEmbeddingImprimitiveWreathProductPermGroup">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="filter"></om:OMS></om:OMOBJ></type>
        
@@ -1395,10 +1395,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingImprimitiveWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingImprimitiveWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1413,10 +1413,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingImprimitiveWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingImprimitiveWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1431,10 +1431,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingImprimitiveWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingImprimitiveWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -1452,10 +1452,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingImprimitiveWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingImprimitiveWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -1473,10 +1473,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingImprimitiveWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingImprimitiveWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -1494,10 +1494,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingImprimitiveWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingImprimitiveWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -1515,10 +1515,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingImprimitiveWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingImprimitiveWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -1536,10 +1536,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingImprimitiveWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingImprimitiveWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -1557,10 +1557,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingImprimitiveWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingImprimitiveWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -1578,10 +1578,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingImprimitiveWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingImprimitiveWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSPGeneralMapping"></om:OMS>
       </om:OMA>
@@ -1599,10 +1599,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingImprimitiveWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingImprimitiveWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -1620,10 +1620,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingImprimitiveWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingImprimitiveWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -1641,10 +1641,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingImprimitiveWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingImprimitiveWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -1662,10 +1662,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingImprimitiveWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingImprimitiveWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -1683,10 +1683,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingImprimitiveWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingImprimitiveWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsInjective"></om:OMS>
       </om:OMA>
@@ -1704,10 +1704,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingImprimitiveWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingImprimitiveWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsInjective"></om:OMS>
       </om:OMA>
@@ -1725,10 +1725,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingImprimitiveWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingImprimitiveWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -1746,10 +1746,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingImprimitiveWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingImprimitiveWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -1767,10 +1767,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingImprimitiveWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingImprimitiveWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -1788,10 +1788,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingImprimitiveWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingImprimitiveWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -1809,10 +1809,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingImprimitiveWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingImprimitiveWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -1830,10 +1830,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingImprimitiveWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingImprimitiveWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -1851,10 +1851,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingImprimitiveWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingImprimitiveWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingWreathProductPermGroup"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1874,10 +1874,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionSubdirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionSubdirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1892,10 +1892,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionSubdirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionSubdirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1910,10 +1910,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionSubdirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionSubdirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -1931,10 +1931,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionSubdirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionSubdirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -1952,10 +1952,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionSubdirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionSubdirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -1973,10 +1973,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionSubdirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionSubdirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -1994,10 +1994,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionSubdirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionSubdirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -2015,10 +2015,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionSubdirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionSubdirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -2036,10 +2036,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionSubdirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionSubdirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -2057,10 +2057,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionSubdirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionSubdirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSPGeneralMapping"></om:OMS>
       </om:OMA>
@@ -2078,10 +2078,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionSubdirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionSubdirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -2099,10 +2099,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionSubdirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionSubdirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -2120,10 +2120,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionSubdirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionSubdirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -2141,10 +2141,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionSubdirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionSubdirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -2162,10 +2162,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionSubdirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionSubdirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSurjective"></om:OMS>
       </om:OMA>
@@ -2183,10 +2183,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionSubdirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionSubdirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSurjective"></om:OMS>
       </om:OMA>
@@ -2204,10 +2204,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionSubdirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionSubdirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -2225,10 +2225,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionSubdirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionSubdirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -2246,10 +2246,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionSubdirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionSubdirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -2267,10 +2267,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionSubdirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionSubdirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -2288,10 +2288,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionSubdirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionSubdirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -2309,10 +2309,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionSubdirectProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsProjectionSubdirectProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -2335,10 +2335,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingProductActionWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingProductActionWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -2353,10 +2353,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingProductActionWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingProductActionWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -2371,10 +2371,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingProductActionWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingProductActionWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -2392,10 +2392,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingProductActionWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingProductActionWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -2413,10 +2413,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingProductActionWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingProductActionWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -2434,10 +2434,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingProductActionWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingProductActionWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -2455,10 +2455,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingProductActionWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingProductActionWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -2476,10 +2476,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingProductActionWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingProductActionWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -2497,10 +2497,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingProductActionWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingProductActionWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -2518,10 +2518,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingProductActionWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingProductActionWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSPGeneralMapping"></om:OMS>
       </om:OMA>
@@ -2539,10 +2539,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingProductActionWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingProductActionWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -2560,10 +2560,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingProductActionWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingProductActionWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -2581,10 +2581,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingProductActionWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingProductActionWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -2602,10 +2602,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingProductActionWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingProductActionWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -2623,10 +2623,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingProductActionWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingProductActionWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsInjective"></om:OMS>
       </om:OMA>
@@ -2644,10 +2644,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingProductActionWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingProductActionWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsInjective"></om:OMS>
       </om:OMA>
@@ -2665,10 +2665,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingProductActionWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingProductActionWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -2686,10 +2686,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingProductActionWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingProductActionWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -2707,10 +2707,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingProductActionWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingProductActionWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -2728,10 +2728,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingProductActionWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingProductActionWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -2749,10 +2749,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingProductActionWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingProductActionWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -2770,10 +2770,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingProductActionWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingProductActionWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -2791,10 +2791,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingProductActionWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingProductActionWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -2809,10 +2809,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingProductActionWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingProductActionWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByAsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsGroupGeneralMappingByAsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -2827,10 +2827,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingProductActionWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingProductActionWreathProductPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingWreathProductPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="gprdperm" name="IsEmbeddingWreathProductPermGroup"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/groebner.omdoc b/content/http..www.gap-system.org/lib/groebner.omdoc
index 217d056257322145509bcea4732a5bf62cd9f2ef..24a58b94f8d62a7d9d16d1f0fca9d9516760ac59 100644
--- a/content/http..www.gap-system.org/lib/groebner.omdoc
+++ b/content/http..www.gap-system.org/lib/groebner.omdoc
@@ -3,7 +3,7 @@
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="category"></om:OMS></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?type"></import><import from="http://www.gap-system.org/lib?groebner"></import><constant name="IsMonomialOrderingDefaultRep">
+     </constant><import from="http://www.gap-system.org/lib?type"></import><constant name="IsMonomialOrderingDefaultRep">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="filter"></om:OMS></om:OMOBJ></type>
        
@@ -17,10 +17,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="groebner" name="IsMonomialOrderingDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="groebner" name="IsMonomialOrderingDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -35,10 +35,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="groebner" name="IsMonomialOrderingDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="groebner" name="IsMonomialOrderingDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -53,10 +53,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="groebner" name="IsMonomialOrderingDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="groebner" name="IsMonomialOrderingDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -71,10 +71,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="groebner" name="IsMonomialOrderingDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="groebner" name="IsMonomialOrderingDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="groebner" name="IsMonomialOrdering"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/grp.omdoc b/content/http..www.gap-system.org/lib/grp.omdoc
index d0ae254f8f4572d3c33e27303786c748a9449fa9..6bcc0adafec030ebd29f3d4d9cd6668bd6d991b7 100644
--- a/content/http..www.gap-system.org/lib/grp.omdoc
+++ b/content/http..www.gap-system.org/lib/grp.omdoc
@@ -1,7 +1,4 @@
-<omdoc xmlns="http://omdoc.org/ns" xmlns:om="http://www.openmath.org/OpenMath">
-  <theory name="grp" base="http://www.gap-system.org/lib"
-	  meta="http://www.gap-system.org/?Types">
-    <import from="http://www.gap-system.org/lib?magma"></import><constant name="NaturalHomomorphism">
+<omdoc xmlns="http://omdoc.org/ns" xmlns:om="http://www.openmath.org/OpenMath"><theory name="grp" base="http://www.gap-system.org/lib" meta="http://www.gap-system.org/?Types"><import from="http://www.gap-system.org/lib?magma"></import><constant name="NaturalHomomorphism">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
@@ -143,10 +140,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grp" name="CanComputeSizeAnySubgroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grp" name="CanComputeSizeAnySubgroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="coll" name="CanComputeSize"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="coll" name="CanComputeSize"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -190,13 +187,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grp" name="IsRightTransversal"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -214,13 +211,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grp" name="IsRightTransversal"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -253,7 +250,7 @@
       </om:OMA></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?type"></import><import from="http://www.gap-system.org/lib?grp"></import><constant name="IsRightTransversalRep">
+     </constant><import from="http://www.gap-system.org/lib?type"></import><constant name="IsRightTransversalRep">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="filter"></om:OMS></om:OMOBJ></type>
        
@@ -267,10 +264,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grp" name="IsRightTransversalRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grp" name="IsRightTransversalRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -285,10 +282,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grp" name="IsRightTransversalRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grp" name="IsRightTransversalRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -303,10 +300,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grp" name="IsRightTransversalRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grp" name="IsRightTransversalRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -324,10 +321,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grp" name="IsRightTransversalRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grp" name="IsRightTransversalRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -345,10 +342,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grp" name="IsRightTransversalRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grp" name="IsRightTransversalRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grp" name="IsRightTransversal"></om:OMS>
       </om:OMA>
@@ -1528,4 +1525,4 @@
       </om:OMA></om:OMOBJ></type>
        
        
-     </constant></theory></omdoc>
+     </constant></theory></omdoc>
\ No newline at end of file
diff --git a/content/http..www.gap-system.org/lib/grpfp.omdoc b/content/http..www.gap-system.org/lib/grpfp.omdoc
index 989df54dc9c3636af6c6f659ad231313d9479409..ddc0f9ba946c98ff1b0a64472246aaa05809ab51 100644
--- a/content/http..www.gap-system.org/lib/grpfp.omdoc
+++ b/content/http..www.gap-system.org/lib/grpfp.omdoc
@@ -20,13 +20,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFgGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -44,13 +44,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFgGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -68,13 +68,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFgGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -92,13 +92,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFgGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -116,13 +116,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFgGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -140,13 +140,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFgGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -170,13 +170,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFgGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -194,13 +194,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFgGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -224,13 +224,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFgGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -254,13 +254,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFgGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -284,13 +284,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFgGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -314,13 +314,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFgGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -338,13 +338,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFgGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagma"></om:OMS>
       </om:OMA>
@@ -362,13 +362,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFgGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithOne"></om:OMS>
       </om:OMA>
@@ -386,13 +386,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFgGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithInversesIfNonzero"></om:OMS>
       </om:OMA>
@@ -410,13 +410,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFgGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithInverses"></om:OMS>
       </om:OMA>
@@ -434,13 +434,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFgGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsAssociative"></om:OMS>
       </om:OMA>
@@ -458,13 +458,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFgGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsAssociative"></om:OMS>
       </om:OMA>
@@ -482,13 +482,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFgGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="MultiplicativeNeutralElement"></om:OMS>
       </om:OMA>
@@ -506,13 +506,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFgGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsGeneratorsOfSemigroup"></om:OMS>
       </om:OMA>
@@ -530,13 +530,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFgGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsGeneratorsOfSemigroup"></om:OMS>
       </om:OMA>
@@ -554,13 +554,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFgGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsSimpleSemigroup"></om:OMS>
       </om:OMA>
@@ -578,13 +578,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFgGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsSimpleSemigroup"></om:OMS>
       </om:OMA>
@@ -602,13 +602,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFgGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsRegularSemigroup"></om:OMS>
       </om:OMA>
@@ -626,13 +626,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFgGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsRegularSemigroup"></om:OMS>
       </om:OMA>
@@ -650,13 +650,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFgGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsInverseSemigroup"></om:OMS>
       </om:OMA>
@@ -674,13 +674,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFgGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsInverseSemigroup"></om:OMS>
       </om:OMA>
@@ -698,13 +698,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFgGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsCompletelyRegularSemigroup"></om:OMS>
       </om:OMA>
@@ -722,13 +722,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFgGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsCompletelyRegularSemigroup"></om:OMS>
       </om:OMA>
@@ -746,13 +746,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFgGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsGroupAsSemigroup"></om:OMS>
       </om:OMA>
@@ -770,13 +770,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFgGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsGroupAsSemigroup"></om:OMS>
       </om:OMA>
@@ -794,13 +794,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFgGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsMonoidAsSemigroup"></om:OMS>
       </om:OMA>
@@ -818,13 +818,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFgGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsMonoidAsSemigroup"></om:OMS>
       </om:OMA>
@@ -842,13 +842,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFgGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsOrthodoxSemigroup"></om:OMS>
       </om:OMA>
@@ -866,13 +866,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFgGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsOrthodoxSemigroup"></om:OMS>
       </om:OMA>
@@ -881,7 +881,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?grpfp"></import><constant name="IsSubgroupFpGroup">
+     </constant><constant name="IsSubgroupFpGroup">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="category"></om:OMS></om:OMOBJ></type>
        
@@ -895,13 +895,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFpGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -919,13 +919,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFpGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -943,13 +943,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFpGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -967,13 +967,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFpGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -991,13 +991,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFpGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -1015,13 +1015,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFpGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1045,13 +1045,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFpGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -1069,13 +1069,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFpGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1099,13 +1099,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFpGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1129,13 +1129,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFpGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1159,13 +1159,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFpGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1189,13 +1189,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFpGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -1213,13 +1213,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFpGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagma"></om:OMS>
       </om:OMA>
@@ -1237,13 +1237,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFpGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithOne"></om:OMS>
       </om:OMA>
@@ -1261,13 +1261,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFpGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithInversesIfNonzero"></om:OMS>
       </om:OMA>
@@ -1285,13 +1285,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFpGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithInverses"></om:OMS>
       </om:OMA>
@@ -1309,13 +1309,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFpGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsAssociative"></om:OMS>
       </om:OMA>
@@ -1333,13 +1333,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFpGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsAssociative"></om:OMS>
       </om:OMA>
@@ -1357,13 +1357,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFpGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="MultiplicativeNeutralElement"></om:OMS>
       </om:OMA>
@@ -1381,13 +1381,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFpGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsGeneratorsOfSemigroup"></om:OMS>
       </om:OMA>
@@ -1405,13 +1405,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFpGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsGeneratorsOfSemigroup"></om:OMS>
       </om:OMA>
@@ -1429,13 +1429,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFpGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsSimpleSemigroup"></om:OMS>
       </om:OMA>
@@ -1453,13 +1453,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFpGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsSimpleSemigroup"></om:OMS>
       </om:OMA>
@@ -1477,13 +1477,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFpGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsRegularSemigroup"></om:OMS>
       </om:OMA>
@@ -1501,13 +1501,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFpGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsRegularSemigroup"></om:OMS>
       </om:OMA>
@@ -1525,13 +1525,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFpGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsInverseSemigroup"></om:OMS>
       </om:OMA>
@@ -1549,13 +1549,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFpGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsInverseSemigroup"></om:OMS>
       </om:OMA>
@@ -1573,13 +1573,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFpGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsCompletelyRegularSemigroup"></om:OMS>
       </om:OMA>
@@ -1597,13 +1597,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFpGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsCompletelyRegularSemigroup"></om:OMS>
       </om:OMA>
@@ -1621,13 +1621,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFpGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsGroupAsSemigroup"></om:OMS>
       </om:OMA>
@@ -1645,13 +1645,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFpGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsGroupAsSemigroup"></om:OMS>
       </om:OMA>
@@ -1669,13 +1669,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFpGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsMonoidAsSemigroup"></om:OMS>
       </om:OMA>
@@ -1693,13 +1693,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFpGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsMonoidAsSemigroup"></om:OMS>
       </om:OMA>
@@ -1717,13 +1717,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFpGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsOrthodoxSemigroup"></om:OMS>
       </om:OMA>
@@ -1741,13 +1741,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFpGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsOrthodoxSemigroup"></om:OMS>
       </om:OMA>
@@ -1765,13 +1765,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFpGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFgGroup"></om:OMS>
       </om:OMA>
@@ -1802,10 +1802,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsRightTransversalFpGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsRightTransversalFpGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1820,10 +1820,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsRightTransversalFpGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsRightTransversalFpGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1838,10 +1838,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsRightTransversalFpGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsRightTransversalFpGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -1859,10 +1859,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsRightTransversalFpGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsRightTransversalFpGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -1880,10 +1880,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsRightTransversalFpGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsRightTransversalFpGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grp" name="IsRightTransversal"></om:OMS>
       </om:OMA>
@@ -1901,10 +1901,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsRightTransversalFpGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsRightTransversalFpGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grp" name="IsRightTransversalRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grp" name="IsRightTransversalRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1924,13 +1924,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsElementOfFpGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -1948,13 +1948,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsElementOfFpGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -1972,13 +1972,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsElementOfFpGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -1996,13 +1996,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsElementOfFpGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -2020,13 +2020,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsElementOfFpGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -2044,13 +2044,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsElementOfFpGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -2081,10 +2081,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -2102,10 +2102,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -2123,10 +2123,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -2144,10 +2144,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -2165,10 +2165,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -2186,10 +2186,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2213,10 +2213,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -2234,10 +2234,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2261,10 +2261,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2288,10 +2288,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2315,10 +2315,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2342,10 +2342,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -2363,10 +2363,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagma"></om:OMS>
       </om:OMA>
@@ -2384,10 +2384,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithOne"></om:OMS>
       </om:OMA>
@@ -2405,10 +2405,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithInversesIfNonzero"></om:OMS>
       </om:OMA>
@@ -2426,10 +2426,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithInverses"></om:OMS>
       </om:OMA>
@@ -2447,10 +2447,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsAssociative"></om:OMS>
       </om:OMA>
@@ -2468,10 +2468,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsAssociative"></om:OMS>
       </om:OMA>
@@ -2489,10 +2489,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="MultiplicativeNeutralElement"></om:OMS>
       </om:OMA>
@@ -2510,10 +2510,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsGeneratorsOfSemigroup"></om:OMS>
       </om:OMA>
@@ -2531,10 +2531,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsGeneratorsOfSemigroup"></om:OMS>
       </om:OMA>
@@ -2552,10 +2552,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsSimpleSemigroup"></om:OMS>
       </om:OMA>
@@ -2573,10 +2573,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsSimpleSemigroup"></om:OMS>
       </om:OMA>
@@ -2594,10 +2594,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsRegularSemigroup"></om:OMS>
       </om:OMA>
@@ -2615,10 +2615,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsRegularSemigroup"></om:OMS>
       </om:OMA>
@@ -2636,10 +2636,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsInverseSemigroup"></om:OMS>
       </om:OMA>
@@ -2657,10 +2657,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsInverseSemigroup"></om:OMS>
       </om:OMA>
@@ -2678,10 +2678,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsCompletelyRegularSemigroup"></om:OMS>
       </om:OMA>
@@ -2699,10 +2699,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsCompletelyRegularSemigroup"></om:OMS>
       </om:OMA>
@@ -2720,10 +2720,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsGroupAsSemigroup"></om:OMS>
       </om:OMA>
@@ -2741,10 +2741,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsGroupAsSemigroup"></om:OMS>
       </om:OMA>
@@ -2762,10 +2762,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsMonoidAsSemigroup"></om:OMS>
       </om:OMA>
@@ -2783,10 +2783,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsMonoidAsSemigroup"></om:OMS>
       </om:OMA>
@@ -2804,10 +2804,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsOrthodoxSemigroup"></om:OMS>
       </om:OMA>
@@ -2825,10 +2825,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsOrthodoxSemigroup"></om:OMS>
       </om:OMA>
@@ -2846,10 +2846,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFgGroup"></om:OMS>
       </om:OMA>
@@ -2867,10 +2867,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupOfWholeGroupByQuotientRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grpfp" name="IsSubgroupFpGroup"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/grplatt.omdoc b/content/http..www.gap-system.org/lib/grplatt.omdoc
index 52dc68af3af1370f0e14fc0e20043b02cb6e53b6..836e0c16212e87ebade30e1c4f7a30d2c462513b 100644
--- a/content/http..www.gap-system.org/lib/grplatt.omdoc
+++ b/content/http..www.gap-system.org/lib/grplatt.omdoc
@@ -12,10 +12,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grplatt" name="IsConjugacyClassSubgroupsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grplatt" name="IsConjugacyClassSubgroupsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -30,10 +30,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grplatt" name="IsConjugacyClassSubgroupsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grplatt" name="IsConjugacyClassSubgroupsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -48,10 +48,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grplatt" name="IsConjugacyClassSubgroupsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grplatt" name="IsConjugacyClassSubgroupsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -69,10 +69,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grplatt" name="IsConjugacyClassSubgroupsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grplatt" name="IsConjugacyClassSubgroupsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -90,10 +90,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grplatt" name="IsConjugacyClassSubgroupsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grplatt" name="IsConjugacyClassSubgroupsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -111,10 +111,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grplatt" name="IsConjugacyClassSubgroupsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grplatt" name="IsConjugacyClassSubgroupsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -132,10 +132,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grplatt" name="IsConjugacyClassSubgroupsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grplatt" name="IsConjugacyClassSubgroupsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -153,10 +153,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grplatt" name="IsConjugacyClassSubgroupsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grplatt" name="IsConjugacyClassSubgroupsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSet"></om:OMS>
       </om:OMA>
@@ -174,10 +174,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grplatt" name="IsConjugacyClassSubgroupsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grplatt" name="IsConjugacyClassSubgroupsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSubset"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSubset"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -192,10 +192,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grplatt" name="IsConjugacyClassSubgroupsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grplatt" name="IsConjugacyClassSubgroupsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalOrbit"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalOrbit"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -223,10 +223,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grplatt" name="IsLatticeSubgroupsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grplatt" name="IsLatticeSubgroupsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -241,16 +241,16 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grplatt" name="IsLatticeSubgroupsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grplatt" name="IsLatticeSubgroupsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?grplatt"></import><constant name="MinimalSupergroupsLattice">
+     </constant><constant name="MinimalSupergroupsLattice">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
@@ -272,10 +272,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grplatt" name="IsConjugacyClassSubgroupsByStabilizerRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grplatt" name="IsConjugacyClassSubgroupsByStabilizerRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -290,10 +290,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grplatt" name="IsConjugacyClassSubgroupsByStabilizerRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grplatt" name="IsConjugacyClassSubgroupsByStabilizerRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -308,10 +308,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grplatt" name="IsConjugacyClassSubgroupsByStabilizerRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grplatt" name="IsConjugacyClassSubgroupsByStabilizerRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -329,10 +329,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grplatt" name="IsConjugacyClassSubgroupsByStabilizerRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grplatt" name="IsConjugacyClassSubgroupsByStabilizerRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -350,10 +350,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grplatt" name="IsConjugacyClassSubgroupsByStabilizerRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grplatt" name="IsConjugacyClassSubgroupsByStabilizerRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -371,10 +371,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grplatt" name="IsConjugacyClassSubgroupsByStabilizerRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grplatt" name="IsConjugacyClassSubgroupsByStabilizerRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -392,10 +392,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grplatt" name="IsConjugacyClassSubgroupsByStabilizerRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grplatt" name="IsConjugacyClassSubgroupsByStabilizerRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -413,10 +413,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grplatt" name="IsConjugacyClassSubgroupsByStabilizerRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grplatt" name="IsConjugacyClassSubgroupsByStabilizerRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSet"></om:OMS>
       </om:OMA>
@@ -434,10 +434,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grplatt" name="IsConjugacyClassSubgroupsByStabilizerRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grplatt" name="IsConjugacyClassSubgroupsByStabilizerRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSubset"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSubset"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -452,10 +452,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grplatt" name="IsConjugacyClassSubgroupsByStabilizerRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grplatt" name="IsConjugacyClassSubgroupsByStabilizerRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalOrbit"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalOrbit"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -470,10 +470,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grplatt" name="IsConjugacyClassSubgroupsByStabilizerRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grplatt" name="IsConjugacyClassSubgroupsByStabilizerRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsExternalOrbitByStabilizerRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="clas" name="IsExternalOrbitByStabilizerRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -488,10 +488,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grplatt" name="IsConjugacyClassSubgroupsByStabilizerRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grplatt" name="IsConjugacyClassSubgroupsByStabilizerRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grplatt" name="IsConjugacyClassSubgroupsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grplatt" name="IsConjugacyClassSubgroupsRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/grpmat.omdoc b/content/http..www.gap-system.org/lib/grpmat.omdoc
index d12a8d96facde9fde717985e84e052299d7808b0..40048ea075322f19409b4a91005fedc0957fd37b 100644
--- a/content/http..www.gap-system.org/lib/grpmat.omdoc
+++ b/content/http..www.gap-system.org/lib/grpmat.omdoc
@@ -76,10 +76,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpmat" name="IsBlowUpIsomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpmat" name="IsBlowUpIsomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -97,10 +97,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpmat" name="IsBlowUpIsomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpmat" name="IsBlowUpIsomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -118,10 +118,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpmat" name="IsBlowUpIsomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpmat" name="IsBlowUpIsomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -139,10 +139,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpmat" name="IsBlowUpIsomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpmat" name="IsBlowUpIsomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -160,10 +160,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpmat" name="IsBlowUpIsomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpmat" name="IsBlowUpIsomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -181,10 +181,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpmat" name="IsBlowUpIsomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpmat" name="IsBlowUpIsomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -202,10 +202,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpmat" name="IsBlowUpIsomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpmat" name="IsBlowUpIsomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -223,10 +223,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpmat" name="IsBlowUpIsomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpmat" name="IsBlowUpIsomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSPGeneralMapping"></om:OMS>
       </om:OMA>
@@ -244,10 +244,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpmat" name="IsBlowUpIsomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpmat" name="IsBlowUpIsomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -265,10 +265,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpmat" name="IsBlowUpIsomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpmat" name="IsBlowUpIsomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -286,10 +286,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpmat" name="IsBlowUpIsomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpmat" name="IsBlowUpIsomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -307,10 +307,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpmat" name="IsBlowUpIsomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpmat" name="IsBlowUpIsomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -328,10 +328,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpmat" name="IsBlowUpIsomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpmat" name="IsBlowUpIsomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsInjective"></om:OMS>
       </om:OMA>
@@ -349,10 +349,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpmat" name="IsBlowUpIsomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpmat" name="IsBlowUpIsomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsInjective"></om:OMS>
       </om:OMA>
@@ -370,10 +370,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpmat" name="IsBlowUpIsomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpmat" name="IsBlowUpIsomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSurjective"></om:OMS>
       </om:OMA>
@@ -391,10 +391,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpmat" name="IsBlowUpIsomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpmat" name="IsBlowUpIsomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSurjective"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/grpnice.omdoc b/content/http..www.gap-system.org/lib/grpnice.omdoc
index 33898e207194324396c9f2e37583e81b11ae8874..73e80528d91bf6b6be7e806c29fa701af1945f87 100644
--- a/content/http..www.gap-system.org/lib/grpnice.omdoc
+++ b/content/http..www.gap-system.org/lib/grpnice.omdoc
@@ -57,10 +57,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpnice" name="IsEnumeratorByNiceomorphismRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpnice" name="IsEnumeratorByNiceomorphismRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -75,10 +75,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpnice" name="IsEnumeratorByNiceomorphismRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grpnice" name="IsEnumeratorByNiceomorphismRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/grppc.omdoc b/content/http..www.gap-system.org/lib/grppc.omdoc
index 43298614aaf0595f7cafed9e793d4361e6ac97d6..62e56e2b4ddc4d70ba3f2d9656351a048b80eda6 100644
--- a/content/http..www.gap-system.org/lib/grppc.omdoc
+++ b/content/http..www.gap-system.org/lib/grppc.omdoc
@@ -12,10 +12,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -33,10 +33,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -54,10 +54,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="coll" name="CanComputeSize"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="coll" name="CanComputeSize"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -72,10 +72,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -93,10 +93,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -114,10 +114,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -135,10 +135,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -162,10 +162,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -183,10 +183,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -210,10 +210,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -237,10 +237,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -264,10 +264,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -291,10 +291,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -312,10 +312,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagma"></om:OMS>
       </om:OMA>
@@ -333,10 +333,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithOne"></om:OMS>
       </om:OMA>
@@ -354,10 +354,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithInversesIfNonzero"></om:OMS>
       </om:OMA>
@@ -375,10 +375,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithInverses"></om:OMS>
       </om:OMA>
@@ -396,10 +396,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsAssociative"></om:OMS>
       </om:OMA>
@@ -417,10 +417,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsAssociative"></om:OMS>
       </om:OMA>
@@ -438,10 +438,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="MultiplicativeNeutralElement"></om:OMS>
       </om:OMA>
@@ -459,10 +459,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsGeneratorsOfSemigroup"></om:OMS>
       </om:OMA>
@@ -480,10 +480,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsGeneratorsOfSemigroup"></om:OMS>
       </om:OMA>
@@ -501,10 +501,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsSimpleSemigroup"></om:OMS>
       </om:OMA>
@@ -522,10 +522,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsSimpleSemigroup"></om:OMS>
       </om:OMA>
@@ -543,10 +543,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsRegularSemigroup"></om:OMS>
       </om:OMA>
@@ -564,10 +564,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsRegularSemigroup"></om:OMS>
       </om:OMA>
@@ -585,10 +585,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsInverseSemigroup"></om:OMS>
       </om:OMA>
@@ -606,10 +606,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsInverseSemigroup"></om:OMS>
       </om:OMA>
@@ -627,10 +627,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsCompletelyRegularSemigroup"></om:OMS>
       </om:OMA>
@@ -648,10 +648,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsCompletelyRegularSemigroup"></om:OMS>
       </om:OMA>
@@ -669,10 +669,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsGroupAsSemigroup"></om:OMS>
       </om:OMA>
@@ -690,10 +690,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsGroupAsSemigroup"></om:OMS>
       </om:OMA>
@@ -711,10 +711,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsMonoidAsSemigroup"></om:OMS>
       </om:OMA>
@@ -732,10 +732,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsMonoidAsSemigroup"></om:OMS>
       </om:OMA>
@@ -753,10 +753,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsOrthodoxSemigroup"></om:OMS>
       </om:OMA>
@@ -774,10 +774,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsOrthodoxSemigroup"></om:OMS>
       </om:OMA>
@@ -795,10 +795,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grp" name="CanComputeSizeAnySubgroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grp" name="CanComputeSizeAnySubgroup"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -813,10 +813,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grp" name="IsSolvableGroup"></om:OMS>
       </om:OMA>
@@ -834,10 +834,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grppc" name="CanEasilyComputePcgs"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grp" name="IsSolvableGroup"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/grpramat.omdoc b/content/http..www.gap-system.org/lib/grpramat.omdoc
index 10940f0cfa7e88b777f4084427daa6e3ff3c697e..c030342658f3a7e1f0ed24032805f00f8b79d372 100644
--- a/content/http..www.gap-system.org/lib/grpramat.omdoc
+++ b/content/http..www.gap-system.org/lib/grpramat.omdoc
@@ -162,7 +162,7 @@
       </om:OMA></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?grpmat"></import><import from="http://www.gap-system.org/lib?grpramat"></import><constant name="IsNaturalSLnZ">
+     </constant><import from="http://www.gap-system.org/lib?grpmat"></import><constant name="IsNaturalSLnZ">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="filter"></om:OMS></om:OMOBJ></type>
        <definition><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
diff --git a/content/http..www.gap-system.org/lib/grptbl.omdoc b/content/http..www.gap-system.org/lib/grptbl.omdoc
index b65a99d9d4495222a8d6f63ab67a77a408079c78..3c4604d4ca4ba6b3040560d7ee941a495d00dce3 100644
--- a/content/http..www.gap-system.org/lib/grptbl.omdoc
+++ b/content/http..www.gap-system.org/lib/grptbl.omdoc
@@ -20,10 +20,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grptbl" name="IsMagmaByMultiplicationTableObj"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grptbl" name="IsMagmaByMultiplicationTableObj"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -38,10 +38,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grptbl" name="IsMagmaByMultiplicationTableObj"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grptbl" name="IsMagmaByMultiplicationTableObj"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -59,10 +59,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grptbl" name="IsMagmaByMultiplicationTableObj"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grptbl" name="IsMagmaByMultiplicationTableObj"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -80,10 +80,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grptbl" name="IsMagmaByMultiplicationTableObj"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grptbl" name="IsMagmaByMultiplicationTableObj"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -101,10 +101,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grptbl" name="IsMagmaByMultiplicationTableObj"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grptbl" name="IsMagmaByMultiplicationTableObj"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -122,10 +122,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grptbl" name="IsMagmaByMultiplicationTableObj"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grptbl" name="IsMagmaByMultiplicationTableObj"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/ieee754.omdoc b/content/http..www.gap-system.org/lib/ieee754.omdoc
index f7077ed460a2559222f2b6a6df82a525ff6858e7..ccf2a90dddf5902051fff2b6724021627b375b97 100644
--- a/content/http..www.gap-system.org/lib/ieee754.omdoc
+++ b/content/http..www.gap-system.org/lib/ieee754.omdoc
@@ -12,13 +12,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ieee754" name="IsIEEE754PseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -36,13 +36,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ieee754" name="IsIEEE754PseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -60,13 +60,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ieee754" name="IsIEEE754PseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -84,13 +84,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ieee754" name="IsIEEE754PseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -108,13 +108,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ieee754" name="IsIEEE754PseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -132,13 +132,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ieee754" name="IsIEEE754PseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -162,13 +162,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ieee754" name="IsIEEE754PseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -192,13 +192,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ieee754" name="IsIEEE754PseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -222,13 +222,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ieee754" name="IsIEEE754PseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -252,13 +252,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ieee754" name="IsIEEE754PseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -282,13 +282,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ieee754" name="IsIEEE754PseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -306,13 +306,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ieee754" name="IsIEEE754PseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -336,13 +336,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ieee754" name="IsIEEE754PseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -360,13 +360,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ieee754" name="IsIEEE754PseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -390,13 +390,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ieee754" name="IsIEEE754PseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -420,13 +420,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ieee754" name="IsIEEE754PseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -444,13 +444,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ieee754" name="IsIEEE754PseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsExtLSet"></om:OMS>
       </om:OMA>
@@ -468,13 +468,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ieee754" name="IsIEEE754PseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpDProd"></om:OMS>
       </om:OMA>
@@ -492,13 +492,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ieee754" name="IsIEEE754PseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpEProd"></om:OMS>
       </om:OMA>
@@ -516,13 +516,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ieee754" name="IsIEEE754PseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpDSum"></om:OMS>
       </om:OMA>
@@ -540,13 +540,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ieee754" name="IsIEEE754PseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpESum"></om:OMS>
       </om:OMA>
@@ -564,13 +564,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ieee754" name="IsIEEE754PseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsTrivialLOpEOne"></om:OMS>
       </om:OMA>
@@ -588,13 +588,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ieee754" name="IsIEEE754PseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnByRing"></om:OMS>
       </om:OMA>
@@ -612,13 +612,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ieee754" name="IsIEEE754PseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnByDivisionRing"></om:OMS>
       </om:OMA>
@@ -636,13 +636,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ieee754" name="IsIEEE754PseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnByDivisionRing"></om:OMS>
       </om:OMA>
@@ -660,13 +660,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ieee754" name="IsIEEE754PseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagma"></om:OMS>
       </om:OMA>
@@ -684,13 +684,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ieee754" name="IsIEEE754PseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagma"></om:OMS>
       </om:OMA>
@@ -708,13 +708,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ieee754" name="IsIEEE754PseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagmaWithZero"></om:OMS>
       </om:OMA>
@@ -732,13 +732,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ieee754" name="IsIEEE754PseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveGroup"></om:OMS>
       </om:OMA>
@@ -756,13 +756,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ieee754" name="IsIEEE754PseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -780,13 +780,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ieee754" name="IsIEEE754PseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -804,13 +804,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ieee754" name="IsIEEE754PseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsLDistributive"></om:OMS>
       </om:OMA>
@@ -828,13 +828,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ieee754" name="IsIEEE754PseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsLDistributive"></om:OMS>
       </om:OMA>
@@ -852,13 +852,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ieee754" name="IsIEEE754PseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsRDistributive"></om:OMS>
       </om:OMA>
@@ -876,13 +876,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ieee754" name="IsIEEE754PseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsRDistributive"></om:OMS>
       </om:OMA>
@@ -900,13 +900,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ieee754" name="IsIEEE754PseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFreeLeftModule"></om:OMS>
       </om:OMA>
@@ -924,13 +924,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ieee754" name="IsIEEE754PseudoField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloatPseudoField"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/info.omdoc b/content/http..www.gap-system.org/lib/info.omdoc
index dfcae9d9d0e7714184b4b497af27ff1df34099b9..ed458cc6ba15505fa4d9b210b23628c2e3647a22 100644
--- a/content/http..www.gap-system.org/lib/info.omdoc
+++ b/content/http..www.gap-system.org/lib/info.omdoc
@@ -3,7 +3,7 @@
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="category"></om:OMS></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?list"></import><import from="http://www.gap-system.org/lib?info"></import><constant name="IsInfoSelector">
+     </constant><import from="http://www.gap-system.org/lib?list"></import><constant name="IsInfoSelector">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="filter"></om:OMS></om:OMOBJ></type>
        <definition><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
@@ -43,10 +43,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="info" name="IsInfoClassListRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="info" name="IsInfoClassListRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/integer.omdoc b/content/http..www.gap-system.org/lib/integer.omdoc
index 47f8eda6bb8ad396a0686e4c13498bf1c0a8d015..f7da528d68b4d04553057535cbe71fd6d5694519 100644
--- a/content/http..www.gap-system.org/lib/integer.omdoc
+++ b/content/http..www.gap-system.org/lib/integer.omdoc
@@ -20,10 +20,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsCanonicalBasisIntegersRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsCanonicalBasisIntegersRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -38,10 +38,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsCanonicalBasisIntegersRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsCanonicalBasisIntegersRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -61,13 +61,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsGaussianIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -85,13 +85,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsGaussianIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -109,13 +109,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsGaussianIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -133,13 +133,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsGaussianIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -157,13 +157,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsGaussianIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -181,13 +181,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsGaussianIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -211,13 +211,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsGaussianIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -241,13 +241,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsGaussianIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -271,13 +271,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsGaussianIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -301,13 +301,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsGaussianIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -331,13 +331,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsGaussianIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -355,13 +355,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsGaussianIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -385,13 +385,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsGaussianIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -409,13 +409,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsGaussianIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -439,13 +439,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsGaussianIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -469,13 +469,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsGaussianIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -499,13 +499,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsGaussianIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -523,13 +523,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsGaussianIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsExtLSet"></om:OMS>
       </om:OMA>
@@ -547,13 +547,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsGaussianIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpDProd"></om:OMS>
       </om:OMA>
@@ -571,13 +571,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsGaussianIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpEProd"></om:OMS>
       </om:OMA>
@@ -595,13 +595,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsGaussianIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpDSum"></om:OMS>
       </om:OMA>
@@ -619,13 +619,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsGaussianIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpESum"></om:OMS>
       </om:OMA>
@@ -643,13 +643,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsGaussianIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsTrivialLOpEOne"></om:OMS>
       </om:OMA>
@@ -667,13 +667,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsGaussianIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnByRing"></om:OMS>
       </om:OMA>
@@ -691,13 +691,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsGaussianIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagma"></om:OMS>
       </om:OMA>
@@ -715,13 +715,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsGaussianIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithOne"></om:OMS>
       </om:OMA>
@@ -739,13 +739,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsGaussianIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="MultiplicativeNeutralElement"></om:OMS>
       </om:OMA>
@@ -763,13 +763,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsGaussianIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagma"></om:OMS>
       </om:OMA>
@@ -787,13 +787,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsGaussianIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagmaWithZero"></om:OMS>
       </om:OMA>
@@ -811,13 +811,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsGaussianIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveGroup"></om:OMS>
       </om:OMA>
@@ -835,13 +835,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsGaussianIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -859,13 +859,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsGaussianIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -883,13 +883,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsGaussianIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsLDistributive"></om:OMS>
       </om:OMA>
@@ -907,13 +907,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsGaussianIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsLDistributive"></om:OMS>
       </om:OMA>
@@ -931,13 +931,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsGaussianIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsRDistributive"></om:OMS>
       </om:OMA>
@@ -955,13 +955,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsGaussianIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsRDistributive"></om:OMS>
       </om:OMA>
@@ -979,13 +979,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsGaussianIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsUniqueFactorizationRing"></om:OMS>
       </om:OMA>
@@ -1003,13 +1003,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsGaussianIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsEuclideanRing"></om:OMS>
       </om:OMA>
@@ -1027,13 +1027,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsGaussianIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFreeLeftModule"></om:OMS>
       </om:OMA>
@@ -1051,13 +1051,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsGaussianIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFiniteDimensional"></om:OMS>
       </om:OMA>
@@ -1075,13 +1075,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsGaussianIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFiniteDimensional"></om:OMS>
       </om:OMA>
@@ -1104,13 +1104,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -1128,13 +1128,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -1152,13 +1152,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1176,13 +1176,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1200,13 +1200,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -1224,13 +1224,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1254,13 +1254,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1284,13 +1284,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1314,13 +1314,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1344,13 +1344,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1374,13 +1374,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -1398,13 +1398,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1428,13 +1428,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -1452,13 +1452,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1482,13 +1482,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1512,13 +1512,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1542,13 +1542,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -1566,13 +1566,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsExtLSet"></om:OMS>
       </om:OMA>
@@ -1590,13 +1590,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpDProd"></om:OMS>
       </om:OMA>
@@ -1614,13 +1614,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpEProd"></om:OMS>
       </om:OMA>
@@ -1638,13 +1638,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpDSum"></om:OMS>
       </om:OMA>
@@ -1662,13 +1662,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpESum"></om:OMS>
       </om:OMA>
@@ -1686,13 +1686,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsTrivialLOpEOne"></om:OMS>
       </om:OMA>
@@ -1710,13 +1710,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnByRing"></om:OMS>
       </om:OMA>
@@ -1734,13 +1734,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagma"></om:OMS>
       </om:OMA>
@@ -1758,13 +1758,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithOne"></om:OMS>
       </om:OMA>
@@ -1782,13 +1782,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="MultiplicativeNeutralElement"></om:OMS>
       </om:OMA>
@@ -1806,13 +1806,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagma"></om:OMS>
       </om:OMA>
@@ -1830,13 +1830,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagmaWithZero"></om:OMS>
       </om:OMA>
@@ -1854,13 +1854,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveGroup"></om:OMS>
       </om:OMA>
@@ -1878,13 +1878,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -1902,13 +1902,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -1926,13 +1926,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsLDistributive"></om:OMS>
       </om:OMA>
@@ -1950,13 +1950,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsLDistributive"></om:OMS>
       </om:OMA>
@@ -1974,13 +1974,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsRDistributive"></om:OMS>
       </om:OMA>
@@ -1998,13 +1998,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsRDistributive"></om:OMS>
       </om:OMA>
@@ -2022,13 +2022,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsUniqueFactorizationRing"></om:OMS>
       </om:OMA>
@@ -2046,13 +2046,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsEuclideanRing"></om:OMS>
       </om:OMA>
@@ -2070,13 +2070,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFreeLeftModule"></om:OMS>
       </om:OMA>
@@ -2099,13 +2099,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsNonnegativeIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -2123,13 +2123,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsNonnegativeIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -2147,13 +2147,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsNonnegativeIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -2171,13 +2171,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsNonnegativeIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -2195,13 +2195,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsNonnegativeIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -2219,13 +2219,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsNonnegativeIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2249,13 +2249,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsNonnegativeIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2279,13 +2279,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsNonnegativeIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2309,13 +2309,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsNonnegativeIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2339,13 +2339,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsNonnegativeIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -2363,13 +2363,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsNonnegativeIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2393,13 +2393,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsNonnegativeIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -2417,13 +2417,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsNonnegativeIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2447,13 +2447,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsNonnegativeIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2477,13 +2477,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsNonnegativeIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2507,13 +2507,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsNonnegativeIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -2531,13 +2531,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsNonnegativeIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagma"></om:OMS>
       </om:OMA>
@@ -2555,13 +2555,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsNonnegativeIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithOne"></om:OMS>
       </om:OMA>
@@ -2579,13 +2579,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsNonnegativeIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="MultiplicativeNeutralElement"></om:OMS>
       </om:OMA>
@@ -2603,13 +2603,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsNonnegativeIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagma"></om:OMS>
       </om:OMA>
@@ -2627,13 +2627,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsNonnegativeIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagmaWithZero"></om:OMS>
       </om:OMA>
@@ -2651,13 +2651,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsNonnegativeIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -2675,13 +2675,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsNonnegativeIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -2699,13 +2699,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsNonnegativeIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsLDistributive"></om:OMS>
       </om:OMA>
@@ -2723,13 +2723,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsNonnegativeIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsLDistributive"></om:OMS>
       </om:OMA>
@@ -2747,13 +2747,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsNonnegativeIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsRDistributive"></om:OMS>
       </om:OMA>
@@ -2771,13 +2771,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsNonnegativeIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsRDistributive"></om:OMS>
       </om:OMA>
@@ -2816,13 +2816,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsPositiveIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -2840,13 +2840,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsPositiveIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -2864,13 +2864,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsPositiveIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -2888,13 +2888,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsPositiveIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -2912,13 +2912,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsPositiveIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -2936,13 +2936,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsPositiveIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2966,13 +2966,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsPositiveIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2996,13 +2996,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsPositiveIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -3026,13 +3026,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsPositiveIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -3050,13 +3050,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsPositiveIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -3080,13 +3080,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsPositiveIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -3104,13 +3104,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsPositiveIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -3134,13 +3134,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsPositiveIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -3164,13 +3164,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsPositiveIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -3194,13 +3194,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsPositiveIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -3218,13 +3218,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsPositiveIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagma"></om:OMS>
       </om:OMA>
@@ -3242,13 +3242,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsPositiveIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithOne"></om:OMS>
       </om:OMA>
@@ -3266,13 +3266,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsPositiveIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="MultiplicativeNeutralElement"></om:OMS>
       </om:OMA>
@@ -3290,13 +3290,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsPositiveIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagma"></om:OMS>
       </om:OMA>
@@ -3314,13 +3314,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsPositiveIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -3338,13 +3338,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsPositiveIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -3362,13 +3362,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsPositiveIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsLDistributive"></om:OMS>
       </om:OMA>
@@ -3386,13 +3386,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsPositiveIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsLDistributive"></om:OMS>
       </om:OMA>
@@ -3410,13 +3410,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsPositiveIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsRDistributive"></om:OMS>
       </om:OMA>
@@ -3434,13 +3434,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="integer" name="IsPositiveIntegers"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsRDistributive"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/kbsemi.omdoc b/content/http..www.gap-system.org/lib/kbsemi.omdoc
index 63752e56a2183aa0625e7489176f6063d3ddd3bb..be015599f3884431b4f655783f29340aaaa83bc1 100644
--- a/content/http..www.gap-system.org/lib/kbsemi.omdoc
+++ b/content/http..www.gap-system.org/lib/kbsemi.omdoc
@@ -20,10 +20,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="kbsemi" name="IsKnuthBendixRewritingSystemRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="kbsemi" name="IsKnuthBendixRewritingSystemRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -43,13 +43,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="kbsemi" name="IsKnuthBendixRewritingSystem"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="object" name="IsCopyable"></om:OMS>
       </om:OMA>
@@ -67,13 +67,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="kbsemi" name="IsKnuthBendixRewritingSystem"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rws" name="IsRewritingSystem"></om:OMS>
       </om:OMA>
@@ -82,7 +82,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?kbsemi"></import><constant name="TzRules">
+     </constant><constant name="TzRules">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
diff --git a/content/http..www.gap-system.org/lib/liefam.omdoc b/content/http..www.gap-system.org/lib/liefam.omdoc
index 07e8f837cbf3371c223eacb2dafdc3b3a5e8a11a..c12346aae6de8517d8dab0b7da83b412f71666b9 100644
--- a/content/http..www.gap-system.org/lib/liefam.omdoc
+++ b/content/http..www.gap-system.org/lib/liefam.omdoc
@@ -12,10 +12,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieEmbeddingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieEmbeddingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -30,10 +30,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieEmbeddingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieEmbeddingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -69,13 +69,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObject"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -93,13 +93,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObject"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -117,13 +117,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObject"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -141,13 +141,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObject"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -165,13 +165,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObject"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -189,13 +189,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObject"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -213,13 +213,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObject"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -237,13 +237,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObject"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -261,13 +261,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObject"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsJacobianElement"></om:OMS>
       </om:OMA>
@@ -285,13 +285,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObject"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZeroSquaredElement"></om:OMS>
       </om:OMA>
@@ -300,7 +300,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?liefam"></import><constant name="UnderlyingRingElement">
+     </constant><constant name="UnderlyingRingElement">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
@@ -322,13 +322,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsRestrictedLieObjectCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -346,13 +346,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsRestrictedLieObjectCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -370,13 +370,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsRestrictedLieObjectCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -394,13 +394,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsRestrictedLieObjectCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -424,13 +424,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsRestrictedLieObjectCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -454,13 +454,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsRestrictedLieObjectCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -484,13 +484,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsRestrictedLieObjectCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -514,13 +514,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsRestrictedLieObjectCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -544,13 +544,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsRestrictedLieObjectCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -568,13 +568,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsRestrictedLieObjectCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -598,13 +598,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsRestrictedLieObjectCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -622,13 +622,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsRestrictedLieObjectCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -652,13 +652,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsRestrictedLieObjectCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -682,13 +682,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsRestrictedLieObjectCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -712,13 +712,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsRestrictedLieObjectCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -742,13 +742,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsRestrictedLieObjectCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -772,13 +772,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsRestrictedLieObjectCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -802,13 +802,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsRestrictedLieObjectCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -865,10 +865,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -883,10 +883,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -901,10 +901,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -922,10 +922,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -943,10 +943,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -964,10 +964,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -985,10 +985,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -1006,10 +1006,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1033,10 +1033,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1060,10 +1060,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1087,10 +1087,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1114,10 +1114,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1141,10 +1141,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -1162,10 +1162,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsExtLSet"></om:OMS>
       </om:OMA>
@@ -1183,10 +1183,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpEProd"></om:OMS>
       </om:OMA>
@@ -1204,10 +1204,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpDSum"></om:OMS>
       </om:OMA>
@@ -1225,10 +1225,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpESum"></om:OMS>
       </om:OMA>
@@ -1246,10 +1246,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsTrivialLOpEOne"></om:OMS>
       </om:OMA>
@@ -1267,10 +1267,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnByRing"></om:OMS>
       </om:OMA>
@@ -1288,10 +1288,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagma"></om:OMS>
       </om:OMA>
@@ -1309,10 +1309,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagmaWithZero"></om:OMS>
       </om:OMA>
@@ -1330,10 +1330,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveGroup"></om:OMS>
       </om:OMA>
@@ -1351,10 +1351,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -1372,10 +1372,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -1393,10 +1393,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFreeLeftModule"></om:OMS>
       </om:OMA>
@@ -1414,10 +1414,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="liefam" name="IsLieObjectsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsHandledByNiceBasis"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/lierep.omdoc b/content/http..www.gap-system.org/lib/lierep.omdoc
index 49ce81a51d4acd3472117a0972338ac9be073c2b..98c073bd7094f7bc03a3e3565b33637ad4c11740 100644
--- a/content/http..www.gap-system.org/lib/lierep.omdoc
+++ b/content/http..www.gap-system.org/lib/lierep.omdoc
@@ -28,13 +28,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsBasisOfWeightRepElementSpace"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsList"></om:OMS>
       </om:OMA>
@@ -52,13 +52,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsBasisOfWeightRepElementSpace"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDenseList"></om:OMS>
       </om:OMA>
@@ -76,13 +76,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsBasisOfWeightRepElementSpace"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsHomogeneousList"></om:OMS>
       </om:OMA>
@@ -100,13 +100,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsBasisOfWeightRepElementSpace"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -124,13 +124,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsBasisOfWeightRepElementSpace"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -148,13 +148,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsBasisOfWeightRepElementSpace"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -172,13 +172,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsBasisOfWeightRepElementSpace"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsBasis"></om:OMS>
       </om:OMA>
@@ -203,7 +203,7 @@
       </om:OMA></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?lierep"></import><constant name="SparseCartanMatrix">
+     </constant><constant name="SparseCartanMatrix">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
@@ -254,13 +254,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsVectorSearchTable"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsSearchTable"></om:OMS>
       </om:OMA>
@@ -283,13 +283,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochain"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -307,13 +307,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochain"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -331,13 +331,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochain"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -355,13 +355,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochain"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -379,13 +379,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochain"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -403,13 +403,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochain"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -427,13 +427,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochain"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -472,10 +472,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsVectorSearchTableDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsVectorSearchTableDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -490,10 +490,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsVectorSearchTableDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsVectorSearchTableDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -508,10 +508,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsVectorSearchTableDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsVectorSearchTableDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsSearchTable"></om:OMS>
       </om:OMA>
@@ -529,10 +529,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsVectorSearchTableDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsVectorSearchTableDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsVectorSearchTable"></om:OMS>
       </om:OMA>
@@ -579,10 +579,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsZeroCochainRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsZeroCochainRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -597,10 +597,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsZeroCochainRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsZeroCochainRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="object" name="IsPackedElementDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="object" name="IsPackedElementDefaultRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -628,13 +628,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsUEALatticeElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -652,13 +652,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsUEALatticeElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -676,13 +676,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsUEALatticeElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -700,13 +700,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsUEALatticeElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -724,13 +724,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsUEALatticeElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -748,13 +748,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsUEALatticeElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -772,13 +772,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsUEALatticeElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -796,13 +796,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsUEALatticeElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -820,13 +820,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsUEALatticeElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -881,13 +881,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsWeightRepElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -905,13 +905,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsWeightRepElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -929,13 +929,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsWeightRepElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -953,13 +953,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsWeightRepElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -977,13 +977,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsWeightRepElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -1001,13 +1001,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsWeightRepElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -1025,13 +1025,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsWeightRepElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -1062,10 +1062,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1080,10 +1080,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1098,10 +1098,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -1119,10 +1119,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -1140,10 +1140,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1161,10 +1161,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1182,10 +1182,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -1203,10 +1203,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1230,10 +1230,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1257,10 +1257,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1284,10 +1284,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1311,10 +1311,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1338,10 +1338,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -1359,10 +1359,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsExtLSet"></om:OMS>
       </om:OMA>
@@ -1380,10 +1380,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpEProd"></om:OMS>
       </om:OMA>
@@ -1401,10 +1401,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpDSum"></om:OMS>
       </om:OMA>
@@ -1422,10 +1422,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpESum"></om:OMS>
       </om:OMA>
@@ -1443,10 +1443,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsTrivialLOpEOne"></om:OMS>
       </om:OMA>
@@ -1464,10 +1464,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnByRing"></om:OMS>
       </om:OMA>
@@ -1485,10 +1485,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagma"></om:OMS>
       </om:OMA>
@@ -1506,10 +1506,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagmaWithZero"></om:OMS>
       </om:OMA>
@@ -1527,10 +1527,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveGroup"></om:OMS>
       </om:OMA>
@@ -1548,10 +1548,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -1569,10 +1569,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -1590,10 +1590,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFreeLeftModule"></om:OMS>
       </om:OMA>
@@ -1611,10 +1611,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="lierep" name="IsCochainsSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsHandledByNiceBasis"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/list.omdoc b/content/http..www.gap-system.org/lib/list.omdoc
index 34e4b74bf90888d05eb8cbff67a153695fc6e008..c438b00aff9c31197aab3e9c2db5c103c2950200 100644
--- a/content/http..www.gap-system.org/lib/list.omdoc
+++ b/content/http..www.gap-system.org/lib/list.omdoc
@@ -20,13 +20,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsList"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -35,7 +35,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?list"></import><constant name="IsDenseList">
+     </constant><constant name="IsDenseList">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="category"></om:OMS></om:OMOBJ></type>
        
@@ -49,13 +49,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDenseList"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsList"></om:OMS>
       </om:OMA>
@@ -73,13 +73,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDenseList"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -102,13 +102,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsHomogeneousList"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsList"></om:OMS>
       </om:OMA>
@@ -126,13 +126,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsHomogeneousList"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDenseList"></om:OMS>
       </om:OMA>
@@ -150,13 +150,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsHomogeneousList"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -179,13 +179,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsConstantTimeAccessList"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsList"></om:OMS>
       </om:OMA>
@@ -203,13 +203,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsConstantTimeAccessList"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -264,13 +264,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsTable"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsList"></om:OMS>
       </om:OMA>
@@ -288,13 +288,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsTable"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDenseList"></om:OMS>
       </om:OMA>
@@ -312,13 +312,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsTable"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsHomogeneousList"></om:OMS>
       </om:OMA>
@@ -336,13 +336,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsTable"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -360,13 +360,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsTable"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -593,13 +593,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsListDefault"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsList"></om:OMS>
       </om:OMA>
@@ -617,13 +617,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsListDefault"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -641,13 +641,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsListDefault"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -665,13 +665,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsListDefault"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -689,13 +689,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsListDefault"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -713,13 +713,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsListDefault"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -737,13 +737,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsListDefault"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -761,13 +761,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsListDefault"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsGeneralizedRowVector"></om:OMS>
       </om:OMA>
@@ -785,13 +785,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsListDefault"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeGeneralizedRowVector"></om:OMS>
       </om:OMA>
@@ -830,10 +830,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsRangeRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsRangeRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsInternalRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsInternalRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -858,10 +858,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsBlistRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsBlistRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsInternalRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsInternalRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -881,10 +881,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsPlistRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsPlistRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="Length"></om:OMS>
       </om:OMA>
@@ -902,10 +902,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsPlistRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsPlistRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsInternalRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsInternalRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -949,13 +949,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsBlist"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsList"></om:OMS>
       </om:OMA>
@@ -973,13 +973,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsBlist"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDenseList"></om:OMS>
       </om:OMA>
@@ -997,13 +997,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsBlist"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsHomogeneousList"></om:OMS>
       </om:OMA>
@@ -1021,13 +1021,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsBlist"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -1146,13 +1146,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsRange"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsList"></om:OMS>
       </om:OMA>
@@ -1170,13 +1170,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsRange"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDenseList"></om:OMS>
       </om:OMA>
@@ -1194,13 +1194,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsRange"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsHomogeneousList"></om:OMS>
       </om:OMA>
@@ -1218,13 +1218,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsRange"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -1242,13 +1242,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsRange"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -1266,13 +1266,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsRange"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -1290,13 +1290,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsRange"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1320,13 +1320,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsRange"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -1344,13 +1344,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsRange"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1374,13 +1374,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsRange"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -1398,13 +1398,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsRange"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1428,13 +1428,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsRange"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -1452,13 +1452,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsRange"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1482,13 +1482,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsRange"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -1506,13 +1506,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsRange"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1536,13 +1536,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsRange"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -1560,13 +1560,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsRange"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1590,13 +1590,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsRange"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -1614,13 +1614,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsRange"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1644,13 +1644,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsRange"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1674,13 +1674,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsRange"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1704,13 +1704,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsRange"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1734,13 +1734,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsRange"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1764,13 +1764,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsRange"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1794,13 +1794,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsRange"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1824,13 +1824,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsRange"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1854,13 +1854,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsRange"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1884,13 +1884,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsRange"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsGeneratorsOfSemigroup"></om:OMS>
       </om:OMA>
@@ -1908,13 +1908,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsRange"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsGeneratorsOfSemigroup"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/macfloat.omdoc b/content/http..www.gap-system.org/lib/macfloat.omdoc
index b2555932d4a24c47d4258e971807c75f39285a57..1e1d60e01842269277e379b02c3b652dd13c544f 100644
--- a/content/http..www.gap-system.org/lib/macfloat.omdoc
+++ b/content/http..www.gap-system.org/lib/macfloat.omdoc
@@ -12,10 +12,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="macfloat" name="IsIEEE754FloatRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="macfloat" name="IsIEEE754FloatRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsInternalRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsInternalRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -30,10 +30,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="macfloat" name="IsIEEE754FloatRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="macfloat" name="IsIEEE754FloatRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -51,10 +51,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="macfloat" name="IsIEEE754FloatRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="macfloat" name="IsIEEE754FloatRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -72,10 +72,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="macfloat" name="IsIEEE754FloatRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="macfloat" name="IsIEEE754FloatRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -93,10 +93,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="macfloat" name="IsIEEE754FloatRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="macfloat" name="IsIEEE754FloatRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -114,10 +114,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="macfloat" name="IsIEEE754FloatRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="macfloat" name="IsIEEE754FloatRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -135,10 +135,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="macfloat" name="IsIEEE754FloatRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="macfloat" name="IsIEEE754FloatRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -156,10 +156,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="macfloat" name="IsIEEE754FloatRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="macfloat" name="IsIEEE754FloatRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -177,10 +177,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="macfloat" name="IsIEEE754FloatRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="macfloat" name="IsIEEE754FloatRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -198,10 +198,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="macfloat" name="IsIEEE754FloatRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="macfloat" name="IsIEEE754FloatRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -219,10 +219,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="macfloat" name="IsIEEE754FloatRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="macfloat" name="IsIEEE754FloatRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -240,10 +240,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="macfloat" name="IsIEEE754FloatRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="macfloat" name="IsIEEE754FloatRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZDFRE"></om:OMS>
       </om:OMA>
@@ -261,10 +261,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="macfloat" name="IsIEEE754FloatRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="macfloat" name="IsIEEE754FloatRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsCommutativeElement"></om:OMS>
       </om:OMA>
@@ -282,10 +282,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="macfloat" name="IsIEEE754FloatRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="macfloat" name="IsIEEE754FloatRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="float" name="IsFloat"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/magma.omdoc b/content/http..www.gap-system.org/lib/magma.omdoc
index 0d721ae94d0056e69d61e28bff5a1fa26f42e66d..123e066ff82f682ffc904784267e5d61f5db42e3 100644
--- a/content/http..www.gap-system.org/lib/magma.omdoc
+++ b/content/http..www.gap-system.org/lib/magma.omdoc
@@ -12,13 +12,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagma"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -36,13 +36,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagma"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -60,13 +60,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagma"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -84,13 +84,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagma"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -108,13 +108,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagma"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -132,13 +132,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagma"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -162,13 +162,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagma"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -186,13 +186,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagma"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -216,13 +216,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagma"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -246,13 +246,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagma"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -261,7 +261,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?magma"></import><constant name="MultiplicativeNeutralElement">
+     </constant><constant name="MultiplicativeNeutralElement">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
@@ -283,13 +283,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithOne"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -307,13 +307,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithOne"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -331,13 +331,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithOne"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -355,13 +355,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithOne"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -379,13 +379,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithOne"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -403,13 +403,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithOne"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -433,13 +433,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithOne"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -457,13 +457,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithOne"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -487,13 +487,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithOne"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -517,13 +517,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithOne"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -547,13 +547,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithOne"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -571,13 +571,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithOne"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagma"></om:OMS>
       </om:OMA>
@@ -595,13 +595,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithOne"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="MultiplicativeNeutralElement"></om:OMS>
       </om:OMA>
@@ -624,13 +624,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithInversesIfNonzero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -648,13 +648,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithInversesIfNonzero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -672,13 +672,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithInversesIfNonzero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -696,13 +696,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithInversesIfNonzero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -720,13 +720,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithInversesIfNonzero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -744,13 +744,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithInversesIfNonzero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -774,13 +774,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithInversesIfNonzero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -798,13 +798,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithInversesIfNonzero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -828,13 +828,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithInversesIfNonzero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -858,13 +858,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithInversesIfNonzero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -888,13 +888,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithInversesIfNonzero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -912,13 +912,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithInversesIfNonzero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagma"></om:OMS>
       </om:OMA>
@@ -936,13 +936,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithInversesIfNonzero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithOne"></om:OMS>
       </om:OMA>
@@ -960,13 +960,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithInversesIfNonzero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="MultiplicativeNeutralElement"></om:OMS>
       </om:OMA>
@@ -989,13 +989,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithInverses"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -1013,13 +1013,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithInverses"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -1037,13 +1037,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithInverses"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1061,13 +1061,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithInverses"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1085,13 +1085,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithInverses"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -1109,13 +1109,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithInverses"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1139,13 +1139,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithInverses"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -1163,13 +1163,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithInverses"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1193,13 +1193,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithInverses"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1223,13 +1223,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithInverses"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1253,13 +1253,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithInverses"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1283,13 +1283,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithInverses"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -1307,13 +1307,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithInverses"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagma"></om:OMS>
       </om:OMA>
@@ -1331,13 +1331,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithInverses"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithOne"></om:OMS>
       </om:OMA>
@@ -1355,13 +1355,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithInverses"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithInversesIfNonzero"></om:OMS>
       </om:OMA>
@@ -1379,13 +1379,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithInverses"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="MultiplicativeNeutralElement"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/mapphomo.omdoc b/content/http..www.gap-system.org/lib/mapphomo.omdoc
index 6658c9ccb6b9456f5d29afdc6b8726079ac34d3d..49343fda3ba6b0e3d521eac28091bf12c645fba3 100644
--- a/content/http..www.gap-system.org/lib/mapphomo.omdoc
+++ b/content/http..www.gap-system.org/lib/mapphomo.omdoc
@@ -30,7 +30,7 @@
       </om:OMA></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?mapphomo"></import><constant name="IsRingWithOneHomomorphism">
+     </constant><constant name="IsRingWithOneHomomorphism">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="filter"></om:OMS></om:OMOBJ></type>
        <definition><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
diff --git a/content/http..www.gap-system.org/lib/mapping.omdoc b/content/http..www.gap-system.org/lib/mapping.omdoc
index 2c39136fc7bb0e1cd3bf2d1e9d6b449e70cf684a..c1c9b8f9bb9104afd63164219e64e41e5297d8ff 100644
--- a/content/http..www.gap-system.org/lib/mapping.omdoc
+++ b/content/http..www.gap-system.org/lib/mapping.omdoc
@@ -12,13 +12,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -36,13 +36,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -60,13 +60,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -84,13 +84,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -108,13 +108,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -132,13 +132,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -147,7 +147,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?mapping"></import><constant name="IsTotal">
+     </constant><constant name="IsTotal">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
@@ -177,13 +177,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSPGeneralMapping"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -201,13 +201,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSPGeneralMapping"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -225,13 +225,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSPGeneralMapping"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -249,13 +249,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSPGeneralMapping"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -273,13 +273,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSPGeneralMapping"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -297,13 +297,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSPGeneralMapping"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -321,13 +321,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSPGeneralMapping"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -374,10 +374,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralRestrictedMappingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralRestrictedMappingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -392,10 +392,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralRestrictedMappingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralRestrictedMappingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -410,10 +410,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralRestrictedMappingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralRestrictedMappingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -431,10 +431,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralRestrictedMappingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralRestrictedMappingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -452,10 +452,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralRestrictedMappingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralRestrictedMappingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -473,10 +473,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralRestrictedMappingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralRestrictedMappingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -494,10 +494,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralRestrictedMappingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralRestrictedMappingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -515,10 +515,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralRestrictedMappingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralRestrictedMappingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -536,10 +536,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralRestrictedMappingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralRestrictedMappingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -562,13 +562,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsNonSPGeneralMapping"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -586,13 +586,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsNonSPGeneralMapping"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -610,13 +610,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsNonSPGeneralMapping"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -634,13 +634,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsNonSPGeneralMapping"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -658,13 +658,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsNonSPGeneralMapping"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -682,13 +682,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsNonSPGeneralMapping"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -706,13 +706,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsNonSPGeneralMapping"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -1037,10 +1037,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsCompositionMappingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsCompositionMappingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1055,10 +1055,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsCompositionMappingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsCompositionMappingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1073,10 +1073,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsCompositionMappingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsCompositionMappingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -1094,10 +1094,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsCompositionMappingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsCompositionMappingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -1115,10 +1115,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsCompositionMappingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsCompositionMappingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -1136,10 +1136,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsCompositionMappingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsCompositionMappingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -1157,10 +1157,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsCompositionMappingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsCompositionMappingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -1178,10 +1178,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsCompositionMappingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsCompositionMappingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -1199,10 +1199,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsCompositionMappingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsCompositionMappingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/mapprep.omdoc b/content/http..www.gap-system.org/lib/mapprep.omdoc
index b77a113942fb672d259f1e95a26a0d18b65ff15a..b24a6bf3680dcd6aabea8004f7d0b48fd4854051 100644
--- a/content/http..www.gap-system.org/lib/mapprep.omdoc
+++ b/content/http..www.gap-system.org/lib/mapprep.omdoc
@@ -12,10 +12,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -30,10 +30,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -48,10 +48,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -69,10 +69,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -90,10 +90,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -111,10 +111,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -132,10 +132,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -153,10 +153,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -174,10 +174,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -195,10 +195,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -216,10 +216,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -237,10 +237,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -258,10 +258,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -270,7 +270,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?mapprep"></import><constant name="IsSPMappingByFunctionRep">
+     </constant><constant name="IsSPMappingByFunctionRep">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="filter"></om:OMS></om:OMOBJ></type>
        
@@ -284,10 +284,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -302,10 +302,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -320,10 +320,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -341,10 +341,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -362,10 +362,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -383,10 +383,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -404,10 +404,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -425,10 +425,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -446,10 +446,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -467,10 +467,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSPGeneralMapping"></om:OMS>
       </om:OMA>
@@ -488,10 +488,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -509,10 +509,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -530,10 +530,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -551,10 +551,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -572,10 +572,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -595,10 +595,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsDefaultGeneralMappingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsDefaultGeneralMappingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -616,10 +616,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsDefaultGeneralMappingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsDefaultGeneralMappingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -637,10 +637,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsDefaultGeneralMappingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsDefaultGeneralMappingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -658,10 +658,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsDefaultGeneralMappingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsDefaultGeneralMappingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -679,10 +679,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsDefaultGeneralMappingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsDefaultGeneralMappingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -700,10 +700,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsDefaultGeneralMappingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsDefaultGeneralMappingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -721,10 +721,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsDefaultGeneralMappingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsDefaultGeneralMappingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -742,10 +742,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsDefaultGeneralMappingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsDefaultGeneralMappingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="Range"></om:OMS>
       </om:OMA>
@@ -763,10 +763,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsDefaultGeneralMappingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsDefaultGeneralMappingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="Source"></om:OMS>
       </om:OMA>
@@ -789,10 +789,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -807,10 +807,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -825,10 +825,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -846,10 +846,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -867,10 +867,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -888,10 +888,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -909,10 +909,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -930,10 +930,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -951,10 +951,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -972,10 +972,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -993,10 +993,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -1014,10 +1014,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -1035,10 +1035,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -1056,10 +1056,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsInjective"></om:OMS>
       </om:OMA>
@@ -1077,10 +1077,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsInjective"></om:OMS>
       </om:OMA>
@@ -1098,10 +1098,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSurjective"></om:OMS>
       </om:OMA>
@@ -1119,10 +1119,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSurjective"></om:OMS>
       </om:OMA>
@@ -1140,10 +1140,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1163,10 +1163,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1181,10 +1181,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1199,10 +1199,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -1220,10 +1220,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -1241,10 +1241,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -1262,10 +1262,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -1283,10 +1283,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -1304,10 +1304,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -1325,10 +1325,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -1346,10 +1346,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSPGeneralMapping"></om:OMS>
       </om:OMA>
@@ -1367,10 +1367,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -1388,10 +1388,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -1409,10 +1409,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -1430,10 +1430,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -1451,10 +1451,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsInjective"></om:OMS>
       </om:OMA>
@@ -1472,10 +1472,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsInjective"></om:OMS>
       </om:OMA>
@@ -1493,10 +1493,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSurjective"></om:OMS>
       </om:OMA>
@@ -1514,10 +1514,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSurjective"></om:OMS>
       </om:OMA>
@@ -1535,10 +1535,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1553,10 +1553,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1571,10 +1571,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsSPMappingByFunctionRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1594,10 +1594,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1612,10 +1612,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1630,10 +1630,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -1651,10 +1651,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -1672,10 +1672,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -1693,10 +1693,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -1714,10 +1714,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -1735,10 +1735,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -1756,10 +1756,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -1777,10 +1777,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsNonSPGeneralMapping"></om:OMS>
       </om:OMA>
@@ -1798,10 +1798,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -1819,10 +1819,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -1840,10 +1840,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -1861,10 +1861,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -1882,10 +1882,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1905,10 +1905,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1923,10 +1923,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1941,10 +1941,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -1962,10 +1962,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -1983,10 +1983,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -2004,10 +2004,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -2025,10 +2025,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -2046,10 +2046,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -2067,10 +2067,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -2088,10 +2088,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsNonSPGeneralMapping"></om:OMS>
       </om:OMA>
@@ -2109,10 +2109,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -2130,10 +2130,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -2151,10 +2151,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -2172,10 +2172,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -2193,10 +2193,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsInjective"></om:OMS>
       </om:OMA>
@@ -2214,10 +2214,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsInjective"></om:OMS>
       </om:OMA>
@@ -2235,10 +2235,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSurjective"></om:OMS>
       </om:OMA>
@@ -2256,10 +2256,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSurjective"></om:OMS>
       </om:OMA>
@@ -2277,10 +2277,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -2295,10 +2295,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -2313,10 +2313,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionWithInverseRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionWithInverseRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsNonSPMappingByFunctionRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -2336,10 +2336,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsInverseGeneralMappingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsInverseGeneralMappingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -2357,10 +2357,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsInverseGeneralMappingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsInverseGeneralMappingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -2378,10 +2378,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsInverseGeneralMappingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsInverseGeneralMappingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -2399,10 +2399,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsInverseGeneralMappingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsInverseGeneralMappingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -2420,10 +2420,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsInverseGeneralMappingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsInverseGeneralMappingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -2441,10 +2441,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsInverseGeneralMappingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsInverseGeneralMappingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -2462,10 +2462,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsInverseGeneralMappingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsInverseGeneralMappingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -2483,10 +2483,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsInverseGeneralMappingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mapprep" name="IsInverseGeneralMappingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsNonSPGeneralMapping"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/mat8bit.omdoc b/content/http..www.gap-system.org/lib/mat8bit.omdoc
index 2f7b5136b00f67c7414de435e38600115c90c360..dd00f72afd0b45931b15465a7ae3db449374c885 100644
--- a/content/http..www.gap-system.org/lib/mat8bit.omdoc
+++ b/content/http..www.gap-system.org/lib/mat8bit.omdoc
@@ -12,10 +12,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mat8bit" name="Is8BitMatrixRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mat8bit" name="Is8BitMatrixRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="object" name="IsCopyable"></om:OMS>
       </om:OMA>
@@ -33,10 +33,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mat8bit" name="Is8BitMatrixRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mat8bit" name="Is8BitMatrixRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -51,10 +51,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mat8bit" name="Is8BitMatrixRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mat8bit" name="Is8BitMatrixRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -72,10 +72,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mat8bit" name="Is8BitMatrixRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mat8bit" name="Is8BitMatrixRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -93,10 +93,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mat8bit" name="Is8BitMatrixRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mat8bit" name="Is8BitMatrixRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -114,10 +114,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mat8bit" name="Is8BitMatrixRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mat8bit" name="Is8BitMatrixRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -135,10 +135,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mat8bit" name="Is8BitMatrixRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mat8bit" name="Is8BitMatrixRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -156,10 +156,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mat8bit" name="Is8BitMatrixRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mat8bit" name="Is8BitMatrixRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -177,10 +177,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mat8bit" name="Is8BitMatrixRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mat8bit" name="Is8BitMatrixRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -198,10 +198,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mat8bit" name="Is8BitMatrixRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mat8bit" name="Is8BitMatrixRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -219,10 +219,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mat8bit" name="Is8BitMatrixRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mat8bit" name="Is8BitMatrixRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -240,10 +240,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mat8bit" name="Is8BitMatrixRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mat8bit" name="Is8BitMatrixRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -261,10 +261,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mat8bit" name="Is8BitMatrixRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mat8bit" name="Is8BitMatrixRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsMatrixObj"></om:OMS>
       </om:OMA>
@@ -282,10 +282,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mat8bit" name="Is8BitMatrixRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mat8bit" name="Is8BitMatrixRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsRowListMatrix"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/matblock.omdoc b/content/http..www.gap-system.org/lib/matblock.omdoc
index c366a8422d69ff8ef9be9c3670b5bd62b0e22393..5e3011a7560a560dd7d75090d6f7660086440d95 100644
--- a/content/http..www.gap-system.org/lib/matblock.omdoc
+++ b/content/http..www.gap-system.org/lib/matblock.omdoc
@@ -12,10 +12,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matblock" name="IsBlockMatrixRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matblock" name="IsBlockMatrixRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/matobj1.omdoc b/content/http..www.gap-system.org/lib/matobj1.omdoc
index 67b866b0bbea980bc8920b2275447ce27bb195a2..b5901ef47d575655bb7815ef89ea1a858e9c0f9b 100644
--- a/content/http..www.gap-system.org/lib/matobj1.omdoc
+++ b/content/http..www.gap-system.org/lib/matobj1.omdoc
@@ -12,13 +12,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsMatrixObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="object" name="IsCopyable"></om:OMS>
       </om:OMA>
@@ -36,13 +36,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsMatrixObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -60,13 +60,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsMatrixObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -84,13 +84,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsMatrixObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -108,13 +108,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsMatrixObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -132,13 +132,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsMatrixObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -156,13 +156,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsMatrixObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -180,13 +180,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsMatrixObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -204,13 +204,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsMatrixObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -228,13 +228,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsMatrixObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -252,13 +252,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsMatrixObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -281,13 +281,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsRowVectorObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="object" name="IsCopyable"></om:OMS>
       </om:OMA>
@@ -305,13 +305,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsRowVectorObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -329,13 +329,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsRowVectorObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -353,13 +353,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsRowVectorObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -377,13 +377,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsRowVectorObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -401,13 +401,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsRowVectorObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -425,13 +425,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsRowVectorObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -449,13 +449,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsRowVectorObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -464,7 +464,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?matobj1"></import><constant name="IsRowListMatrix">
+     </constant><constant name="IsRowListMatrix">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="category"></om:OMS></om:OMOBJ></type>
        
@@ -478,13 +478,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsRowListMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="object" name="IsCopyable"></om:OMS>
       </om:OMA>
@@ -502,13 +502,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsRowListMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -526,13 +526,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsRowListMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -550,13 +550,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsRowListMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -574,13 +574,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsRowListMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -598,13 +598,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsRowListMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -622,13 +622,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsRowListMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -646,13 +646,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsRowListMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -670,13 +670,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsRowListMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -694,13 +694,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsRowListMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -718,13 +718,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsRowListMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -742,13 +742,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsRowListMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsMatrixObj"></om:OMS>
       </om:OMA>
@@ -771,13 +771,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsFlatMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="object" name="IsCopyable"></om:OMS>
       </om:OMA>
@@ -795,13 +795,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsFlatMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -819,13 +819,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsFlatMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -843,13 +843,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsFlatMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -867,13 +867,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsFlatMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -891,13 +891,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsFlatMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -915,13 +915,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsFlatMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -939,13 +939,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsFlatMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -963,13 +963,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsFlatMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -987,13 +987,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsFlatMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -1011,13 +1011,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsFlatMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -1035,13 +1035,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsFlatMatrix"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsMatrixObj"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/matobjplist.omdoc b/content/http..www.gap-system.org/lib/matobjplist.omdoc
index 41f411432244eaaaa4d1c398b1d92c8436d28025..b597ad1cf63d03ebd2a49c26ec571e052ba5bc05 100644
--- a/content/http..www.gap-system.org/lib/matobjplist.omdoc
+++ b/content/http..www.gap-system.org/lib/matobjplist.omdoc
@@ -22,10 +22,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matobjplist" name="IsPlistVectorRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matobjplist" name="IsPlistVectorRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="object" name="IsCopyable"></om:OMS>
       </om:OMA>
@@ -43,10 +43,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matobjplist" name="IsPlistVectorRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matobjplist" name="IsPlistVectorRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -61,10 +61,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matobjplist" name="IsPlistVectorRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matobjplist" name="IsPlistVectorRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -82,10 +82,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matobjplist" name="IsPlistVectorRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matobjplist" name="IsPlistVectorRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -103,10 +103,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matobjplist" name="IsPlistVectorRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matobjplist" name="IsPlistVectorRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -124,10 +124,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matobjplist" name="IsPlistVectorRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matobjplist" name="IsPlistVectorRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -145,10 +145,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matobjplist" name="IsPlistVectorRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matobjplist" name="IsPlistVectorRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -166,10 +166,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matobjplist" name="IsPlistVectorRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matobjplist" name="IsPlistVectorRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -187,10 +187,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matobjplist" name="IsPlistVectorRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matobjplist" name="IsPlistVectorRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -208,10 +208,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matobjplist" name="IsPlistVectorRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matobjplist" name="IsPlistVectorRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsRowVectorObj"></om:OMS>
       </om:OMA>
@@ -234,10 +234,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matobjplist" name="IsPlistMatrixRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matobjplist" name="IsPlistMatrixRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="object" name="IsCopyable"></om:OMS>
       </om:OMA>
@@ -255,10 +255,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matobjplist" name="IsPlistMatrixRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matobjplist" name="IsPlistMatrixRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -273,10 +273,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matobjplist" name="IsPlistMatrixRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matobjplist" name="IsPlistMatrixRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -294,10 +294,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matobjplist" name="IsPlistMatrixRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matobjplist" name="IsPlistMatrixRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -315,10 +315,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matobjplist" name="IsPlistMatrixRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matobjplist" name="IsPlistMatrixRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -336,10 +336,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matobjplist" name="IsPlistMatrixRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matobjplist" name="IsPlistMatrixRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -357,10 +357,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matobjplist" name="IsPlistMatrixRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matobjplist" name="IsPlistMatrixRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -378,10 +378,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matobjplist" name="IsPlistMatrixRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matobjplist" name="IsPlistMatrixRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -399,10 +399,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matobjplist" name="IsPlistMatrixRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matobjplist" name="IsPlistMatrixRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -420,10 +420,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matobjplist" name="IsPlistMatrixRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matobjplist" name="IsPlistMatrixRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -441,10 +441,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matobjplist" name="IsPlistMatrixRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matobjplist" name="IsPlistMatrixRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -462,10 +462,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matobjplist" name="IsPlistMatrixRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matobjplist" name="IsPlistMatrixRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -483,10 +483,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matobjplist" name="IsPlistMatrixRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matobjplist" name="IsPlistMatrixRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsMatrixObj"></om:OMS>
       </om:OMA>
@@ -504,10 +504,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matobjplist" name="IsPlistMatrixRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matobjplist" name="IsPlistMatrixRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsRowListMatrix"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/matrix.omdoc b/content/http..www.gap-system.org/lib/matrix.omdoc
index 8cdfd0fe84e8e9e0f1f4cd0b654756e872195e49..bab811f0ccc775a64725a0a8d61aaa6d723f10d7 100644
--- a/content/http..www.gap-system.org/lib/matrix.omdoc
+++ b/content/http..www.gap-system.org/lib/matrix.omdoc
@@ -52,10 +52,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsList"></om:OMS>
       </om:OMA>
@@ -73,10 +73,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDenseList"></om:OMS>
       </om:OMA>
@@ -94,10 +94,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsHomogeneousList"></om:OMS>
       </om:OMA>
@@ -115,10 +115,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsTable"></om:OMS>
       </om:OMA>
@@ -136,10 +136,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -157,10 +157,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -178,10 +178,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -199,10 +199,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -226,10 +226,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -259,10 +259,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -280,10 +280,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -307,10 +307,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -340,10 +340,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -361,10 +361,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -388,10 +388,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -421,10 +421,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -442,10 +442,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -469,10 +469,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -502,10 +502,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -523,10 +523,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -550,10 +550,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -583,10 +583,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -604,10 +604,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -631,10 +631,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -664,10 +664,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -685,10 +685,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -712,10 +712,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -745,10 +745,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -766,10 +766,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -799,10 +799,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="matrix" name="IsNullMapMatrix"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsGeneralizedRowVector"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/memory.omdoc b/content/http..www.gap-system.org/lib/memory.omdoc
index afedf38cac33cf98b4648f6f93542077cda90f36..f6d371bd97ff68105441df5ef6748d2bc488c63e 100644
--- a/content/http..www.gap-system.org/lib/memory.omdoc
+++ b/content/http..www.gap-system.org/lib/memory.omdoc
@@ -3,7 +3,7 @@
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="filter"></om:OMS></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?type"></import><import from="http://www.gap-system.org/lib?arith"></import><import from="http://www.gap-system.org/lib?memory"></import><constant name="IsObjWithMemory">
+     </constant><import from="http://www.gap-system.org/lib?type"></import><import from="http://www.gap-system.org/lib?arith"></import><constant name="IsObjWithMemory">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="filter"></om:OMS></om:OMOBJ></type>
        
@@ -17,10 +17,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="memory" name="IsObjWithMemory"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="memory" name="IsObjWithMemory"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -35,10 +35,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="memory" name="IsObjWithMemory"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="memory" name="IsObjWithMemory"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -56,10 +56,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="memory" name="IsObjWithMemory"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="memory" name="IsObjWithMemory"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -77,10 +77,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="memory" name="IsObjWithMemory"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="memory" name="IsObjWithMemory"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -98,10 +98,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="memory" name="IsObjWithMemory"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="memory" name="IsObjWithMemory"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -119,10 +119,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="memory" name="IsObjWithMemory"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="memory" name="IsObjWithMemory"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -140,10 +140,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="memory" name="IsObjWithMemory"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="memory" name="IsObjWithMemory"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="memory" name="IsObjWithMemoryRankFilter"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="memory" name="IsObjWithMemoryRankFilter"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/mgmadj.omdoc b/content/http..www.gap-system.org/lib/mgmadj.omdoc
index 3ae735bcc1a940e205fca08e34b1c49de06bc86f..343a2c81221ec60ec11f8de6e9d8a868d7b06d7d 100644
--- a/content/http..www.gap-system.org/lib/mgmadj.omdoc
+++ b/content/http..www.gap-system.org/lib/mgmadj.omdoc
@@ -12,13 +12,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmadj" name="IsMultiplicativeElementWithZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -36,13 +36,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmadj" name="IsMultiplicativeElementWithZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -60,13 +60,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmadj" name="IsMultiplicativeElementWithZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -75,7 +75,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?type"></import><import from="http://www.gap-system.org/lib?mgmadj"></import><constant name="IsMagmaWithZeroAdjoinedElementRep">
+     </constant><import from="http://www.gap-system.org/lib?type"></import><constant name="IsMagmaWithZeroAdjoinedElementRep">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="filter"></om:OMS></om:OMOBJ></type>
        
@@ -89,10 +89,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmadj" name="IsMagmaWithZeroAdjoinedElementRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmadj" name="IsMagmaWithZeroAdjoinedElementRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -107,10 +107,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmadj" name="IsMagmaWithZeroAdjoinedElementRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmadj" name="IsMagmaWithZeroAdjoinedElementRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -125,10 +125,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmadj" name="IsMagmaWithZeroAdjoinedElementRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmadj" name="IsMagmaWithZeroAdjoinedElementRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -146,10 +146,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmadj" name="IsMagmaWithZeroAdjoinedElementRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmadj" name="IsMagmaWithZeroAdjoinedElementRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -167,10 +167,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmadj" name="IsMagmaWithZeroAdjoinedElementRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmadj" name="IsMagmaWithZeroAdjoinedElementRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -188,10 +188,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmadj" name="IsMagmaWithZeroAdjoinedElementRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmadj" name="IsMagmaWithZeroAdjoinedElementRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmadj" name="IsMultiplicativeElementWithZero"></om:OMS>
       </om:OMA>
@@ -230,13 +230,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmadj" name="IsMagmaWithZeroAdjoined"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -254,13 +254,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmadj" name="IsMagmaWithZeroAdjoined"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -278,13 +278,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmadj" name="IsMagmaWithZeroAdjoined"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -302,13 +302,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmadj" name="IsMagmaWithZeroAdjoined"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -326,13 +326,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmadj" name="IsMagmaWithZeroAdjoined"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -350,13 +350,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmadj" name="IsMagmaWithZeroAdjoined"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -380,13 +380,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmadj" name="IsMagmaWithZeroAdjoined"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -404,13 +404,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmadj" name="IsMagmaWithZeroAdjoined"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -434,13 +434,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmadj" name="IsMagmaWithZeroAdjoined"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -464,13 +464,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmadj" name="IsMagmaWithZeroAdjoined"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -488,13 +488,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmadj" name="IsMagmaWithZeroAdjoined"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagma"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/mgmcong.omdoc b/content/http..www.gap-system.org/lib/mgmcong.omdoc
index f143d03d6317016f859ef39623d7056bb8c4afb1..5d1e86d9603f0765e9842b59ae8b4c1a576404ec 100644
--- a/content/http..www.gap-system.org/lib/mgmcong.omdoc
+++ b/content/http..www.gap-system.org/lib/mgmcong.omdoc
@@ -12,13 +12,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsLeftMagmaCongruence"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsEndoGeneralMapping"></om:OMS>
       </om:OMA>
@@ -36,13 +36,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsLeftMagmaCongruence"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsEndoGeneralMapping"></om:OMS>
       </om:OMA>
@@ -60,13 +60,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsLeftMagmaCongruence"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -84,13 +84,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsLeftMagmaCongruence"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -108,13 +108,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsLeftMagmaCongruence"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsReflexiveBinaryRelation"></om:OMS>
       </om:OMA>
@@ -132,13 +132,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsLeftMagmaCongruence"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsReflexiveBinaryRelation"></om:OMS>
       </om:OMA>
@@ -156,13 +156,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsLeftMagmaCongruence"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsSymmetricBinaryRelation"></om:OMS>
       </om:OMA>
@@ -180,13 +180,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsLeftMagmaCongruence"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsSymmetricBinaryRelation"></om:OMS>
       </om:OMA>
@@ -204,13 +204,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsLeftMagmaCongruence"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsTransitiveBinaryRelation"></om:OMS>
       </om:OMA>
@@ -228,13 +228,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsLeftMagmaCongruence"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsTransitiveBinaryRelation"></om:OMS>
       </om:OMA>
@@ -252,13 +252,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsLeftMagmaCongruence"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsPreOrderBinaryRelation"></om:OMS>
       </om:OMA>
@@ -276,13 +276,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsLeftMagmaCongruence"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsPreOrderBinaryRelation"></om:OMS>
       </om:OMA>
@@ -300,13 +300,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsLeftMagmaCongruence"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsEquivalenceRelation"></om:OMS>
       </om:OMA>
@@ -324,13 +324,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsLeftMagmaCongruence"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsEquivalenceRelation"></om:OMS>
       </om:OMA>
@@ -353,13 +353,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsRightMagmaCongruence"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsEndoGeneralMapping"></om:OMS>
       </om:OMA>
@@ -377,13 +377,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsRightMagmaCongruence"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsEndoGeneralMapping"></om:OMS>
       </om:OMA>
@@ -401,13 +401,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsRightMagmaCongruence"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -425,13 +425,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsRightMagmaCongruence"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -449,13 +449,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsRightMagmaCongruence"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsReflexiveBinaryRelation"></om:OMS>
       </om:OMA>
@@ -473,13 +473,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsRightMagmaCongruence"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsReflexiveBinaryRelation"></om:OMS>
       </om:OMA>
@@ -497,13 +497,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsRightMagmaCongruence"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsSymmetricBinaryRelation"></om:OMS>
       </om:OMA>
@@ -521,13 +521,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsRightMagmaCongruence"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsSymmetricBinaryRelation"></om:OMS>
       </om:OMA>
@@ -545,13 +545,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsRightMagmaCongruence"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsTransitiveBinaryRelation"></om:OMS>
       </om:OMA>
@@ -569,13 +569,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsRightMagmaCongruence"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsTransitiveBinaryRelation"></om:OMS>
       </om:OMA>
@@ -593,13 +593,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsRightMagmaCongruence"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsPreOrderBinaryRelation"></om:OMS>
       </om:OMA>
@@ -617,13 +617,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsRightMagmaCongruence"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsPreOrderBinaryRelation"></om:OMS>
       </om:OMA>
@@ -641,13 +641,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsRightMagmaCongruence"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsEquivalenceRelation"></om:OMS>
       </om:OMA>
@@ -665,13 +665,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsRightMagmaCongruence"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsEquivalenceRelation"></om:OMS>
       </om:OMA>
@@ -680,7 +680,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?mapphomo"></import><import from="http://www.gap-system.org/lib?mgmcong"></import><constant name="IsMagmaCongruence">
+     </constant><import from="http://www.gap-system.org/lib?mapphomo"></import><constant name="IsMagmaCongruence">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="category"></om:OMS></om:OMOBJ></type>
        
@@ -694,13 +694,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsMagmaCongruence"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsEndoGeneralMapping"></om:OMS>
       </om:OMA>
@@ -718,13 +718,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsMagmaCongruence"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsEndoGeneralMapping"></om:OMS>
       </om:OMA>
@@ -742,13 +742,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsMagmaCongruence"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -766,13 +766,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsMagmaCongruence"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -790,13 +790,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsMagmaCongruence"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -814,13 +814,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsMagmaCongruence"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -838,13 +838,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsMagmaCongruence"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsReflexiveBinaryRelation"></om:OMS>
       </om:OMA>
@@ -862,13 +862,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsMagmaCongruence"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsReflexiveBinaryRelation"></om:OMS>
       </om:OMA>
@@ -886,13 +886,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsMagmaCongruence"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsSymmetricBinaryRelation"></om:OMS>
       </om:OMA>
@@ -910,13 +910,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsMagmaCongruence"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsSymmetricBinaryRelation"></om:OMS>
       </om:OMA>
@@ -934,13 +934,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsMagmaCongruence"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsTransitiveBinaryRelation"></om:OMS>
       </om:OMA>
@@ -958,13 +958,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsMagmaCongruence"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsTransitiveBinaryRelation"></om:OMS>
       </om:OMA>
@@ -982,13 +982,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsMagmaCongruence"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsPreOrderBinaryRelation"></om:OMS>
       </om:OMA>
@@ -1006,13 +1006,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsMagmaCongruence"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsPreOrderBinaryRelation"></om:OMS>
       </om:OMA>
@@ -1030,13 +1030,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsMagmaCongruence"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsEquivalenceRelation"></om:OMS>
       </om:OMA>
@@ -1054,13 +1054,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsMagmaCongruence"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsEquivalenceRelation"></om:OMS>
       </om:OMA>
@@ -1078,13 +1078,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsMagmaCongruence"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsLeftMagmaCongruence"></om:OMS>
       </om:OMA>
@@ -1102,13 +1102,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsMagmaCongruence"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsRightMagmaCongruence"></om:OMS>
       </om:OMA>
@@ -1155,13 +1155,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsCongruenceClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -1179,13 +1179,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsCongruenceClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -1203,13 +1203,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsCongruenceClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1227,13 +1227,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsCongruenceClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1251,13 +1251,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsCongruenceClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -1275,13 +1275,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsCongruenceClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -1299,13 +1299,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsCongruenceClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -1323,13 +1323,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsCongruenceClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -1347,13 +1347,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmcong" name="IsCongruenceClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsEquivalenceClass"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/mgmring.omdoc b/content/http..www.gap-system.org/lib/mgmring.omdoc
index d6baa4794d7842cd5bad0e9f29be3d89582e0537..6997dc9456413c5c86c5cd7f827897face619272 100644
--- a/content/http..www.gap-system.org/lib/mgmring.omdoc
+++ b/content/http..www.gap-system.org/lib/mgmring.omdoc
@@ -12,13 +12,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsElementOfMagmaRingModuloRelations"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -36,13 +36,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsElementOfMagmaRingModuloRelations"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -60,13 +60,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsElementOfMagmaRingModuloRelations"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -84,13 +84,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsElementOfMagmaRingModuloRelations"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -108,13 +108,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsElementOfMagmaRingModuloRelations"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -132,13 +132,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsElementOfMagmaRingModuloRelations"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -156,13 +156,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsElementOfMagmaRingModuloRelations"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -180,13 +180,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsElementOfMagmaRingModuloRelations"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -204,13 +204,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsElementOfMagmaRingModuloRelations"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -228,13 +228,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsElementOfMagmaRingModuloRelations"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -243,7 +243,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?type"></import><import from="http://www.gap-system.org/lib?mgmring"></import><constant name="IsElementOfMagmaRingModuloSpanOfZeroFamily">
+     </constant><import from="http://www.gap-system.org/lib?type"></import><constant name="IsElementOfMagmaRingModuloSpanOfZeroFamily">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="category"></om:OMS></om:OMOBJ></type>
        
@@ -257,13 +257,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsElementOfMagmaRingModuloSpanOfZeroFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsFamily"></om:OMS>
       </om:OMA>
@@ -281,13 +281,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsElementOfMagmaRingModuloSpanOfZeroFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -317,13 +317,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsElementOfMagmaRingModuloSpanOfZeroFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -359,13 +359,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsElementOfMagmaRingModuloSpanOfZeroFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -402,13 +402,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsElementOfFreeMagmaRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -426,13 +426,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsElementOfFreeMagmaRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -450,13 +450,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsElementOfFreeMagmaRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -474,13 +474,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsElementOfFreeMagmaRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -498,13 +498,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsElementOfFreeMagmaRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -522,13 +522,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsElementOfFreeMagmaRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -546,13 +546,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsElementOfFreeMagmaRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -570,13 +570,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsElementOfFreeMagmaRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -594,13 +594,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsElementOfFreeMagmaRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -618,13 +618,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsElementOfFreeMagmaRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -642,13 +642,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsElementOfFreeMagmaRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsElementOfMagmaRingModuloRelations"></om:OMS>
       </om:OMA>
@@ -679,10 +679,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingObjDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingObjDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -702,10 +702,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsCanonicalBasisFreeMagmaRingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsCanonicalBasisFreeMagmaRingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -720,10 +720,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsCanonicalBasisFreeMagmaRingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsCanonicalBasisFreeMagmaRingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -738,10 +738,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsCanonicalBasisFreeMagmaRingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsCanonicalBasisFreeMagmaRingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsCanonicalBasis"></om:OMS>
       </om:OMA>
@@ -759,10 +759,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsCanonicalBasisFreeMagmaRingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsCanonicalBasisFreeMagmaRingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="basis" name="IsCanonicalBasis"></om:OMS>
       </om:OMA>
@@ -785,13 +785,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloRelations"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -809,13 +809,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloRelations"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -833,13 +833,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloRelations"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -857,13 +857,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloRelations"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -881,13 +881,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloRelations"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -905,13 +905,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloRelations"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -935,13 +935,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloRelations"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -965,13 +965,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloRelations"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -995,13 +995,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloRelations"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1025,13 +1025,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloRelations"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1055,13 +1055,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloRelations"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -1079,13 +1079,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloRelations"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1109,13 +1109,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloRelations"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -1133,13 +1133,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloRelations"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1163,13 +1163,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloRelations"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1193,13 +1193,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloRelations"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -1217,13 +1217,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloRelations"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsExtLSet"></om:OMS>
       </om:OMA>
@@ -1241,13 +1241,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloRelations"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpDProd"></om:OMS>
       </om:OMA>
@@ -1265,13 +1265,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloRelations"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpEProd"></om:OMS>
       </om:OMA>
@@ -1289,13 +1289,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloRelations"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpDSum"></om:OMS>
       </om:OMA>
@@ -1313,13 +1313,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloRelations"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpESum"></om:OMS>
       </om:OMA>
@@ -1337,13 +1337,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloRelations"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsTrivialLOpEOne"></om:OMS>
       </om:OMA>
@@ -1361,13 +1361,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloRelations"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnByRing"></om:OMS>
       </om:OMA>
@@ -1385,13 +1385,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloRelations"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagma"></om:OMS>
       </om:OMA>
@@ -1409,13 +1409,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloRelations"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagma"></om:OMS>
       </om:OMA>
@@ -1433,13 +1433,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloRelations"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagmaWithZero"></om:OMS>
       </om:OMA>
@@ -1457,13 +1457,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloRelations"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveGroup"></om:OMS>
       </om:OMA>
@@ -1481,13 +1481,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloRelations"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -1505,13 +1505,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloRelations"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -1529,13 +1529,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloRelations"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsLDistributive"></om:OMS>
       </om:OMA>
@@ -1553,13 +1553,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloRelations"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsLDistributive"></om:OMS>
       </om:OMA>
@@ -1577,13 +1577,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloRelations"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsRDistributive"></om:OMS>
       </om:OMA>
@@ -1601,13 +1601,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloRelations"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsRDistributive"></om:OMS>
       </om:OMA>
@@ -1625,13 +1625,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloRelations"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFreeLeftModule"></om:OMS>
       </om:OMA>
@@ -1654,13 +1654,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsFreeMagmaRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -1678,13 +1678,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsFreeMagmaRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -1702,13 +1702,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsFreeMagmaRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1726,13 +1726,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsFreeMagmaRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1750,13 +1750,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsFreeMagmaRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -1774,13 +1774,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsFreeMagmaRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1804,13 +1804,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsFreeMagmaRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1834,13 +1834,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsFreeMagmaRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1864,13 +1864,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsFreeMagmaRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1894,13 +1894,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsFreeMagmaRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1924,13 +1924,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsFreeMagmaRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -1948,13 +1948,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsFreeMagmaRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1978,13 +1978,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsFreeMagmaRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -2002,13 +2002,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsFreeMagmaRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2032,13 +2032,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsFreeMagmaRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2062,13 +2062,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsFreeMagmaRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -2086,13 +2086,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsFreeMagmaRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsExtLSet"></om:OMS>
       </om:OMA>
@@ -2110,13 +2110,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsFreeMagmaRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpDProd"></om:OMS>
       </om:OMA>
@@ -2134,13 +2134,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsFreeMagmaRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpEProd"></om:OMS>
       </om:OMA>
@@ -2158,13 +2158,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsFreeMagmaRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpDSum"></om:OMS>
       </om:OMA>
@@ -2182,13 +2182,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsFreeMagmaRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpESum"></om:OMS>
       </om:OMA>
@@ -2206,13 +2206,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsFreeMagmaRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsTrivialLOpEOne"></om:OMS>
       </om:OMA>
@@ -2230,13 +2230,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsFreeMagmaRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnByRing"></om:OMS>
       </om:OMA>
@@ -2254,13 +2254,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsFreeMagmaRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagma"></om:OMS>
       </om:OMA>
@@ -2278,13 +2278,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsFreeMagmaRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagma"></om:OMS>
       </om:OMA>
@@ -2302,13 +2302,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsFreeMagmaRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagmaWithZero"></om:OMS>
       </om:OMA>
@@ -2326,13 +2326,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsFreeMagmaRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveGroup"></om:OMS>
       </om:OMA>
@@ -2350,13 +2350,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsFreeMagmaRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -2374,13 +2374,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsFreeMagmaRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -2398,13 +2398,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsFreeMagmaRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsLDistributive"></om:OMS>
       </om:OMA>
@@ -2422,13 +2422,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsFreeMagmaRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsLDistributive"></om:OMS>
       </om:OMA>
@@ -2446,13 +2446,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsFreeMagmaRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsRDistributive"></om:OMS>
       </om:OMA>
@@ -2470,13 +2470,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsFreeMagmaRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsRDistributive"></om:OMS>
       </om:OMA>
@@ -2494,13 +2494,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsFreeMagmaRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFreeLeftModule"></om:OMS>
       </om:OMA>
@@ -2518,13 +2518,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsFreeMagmaRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloRelations"></om:OMS>
       </om:OMA>
@@ -2563,10 +2563,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingMagmaMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingMagmaMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -2581,10 +2581,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingMagmaMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingMagmaMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -2599,10 +2599,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingMagmaMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingMagmaMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -2620,10 +2620,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingMagmaMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingMagmaMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -2641,10 +2641,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingMagmaMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingMagmaMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -2662,10 +2662,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingMagmaMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingMagmaMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -2683,10 +2683,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingMagmaMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingMagmaMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -2704,10 +2704,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingMagmaMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingMagmaMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -2725,10 +2725,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingMagmaMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingMagmaMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -2746,10 +2746,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingMagmaMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingMagmaMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSPGeneralMapping"></om:OMS>
       </om:OMA>
@@ -2767,10 +2767,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingMagmaMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingMagmaMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -2788,10 +2788,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingMagmaMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingMagmaMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -2809,10 +2809,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingMagmaMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingMagmaMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -2830,10 +2830,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingMagmaMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingMagmaMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -2851,10 +2851,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingMagmaMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingMagmaMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsInjective"></om:OMS>
       </om:OMA>
@@ -2872,10 +2872,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingMagmaMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingMagmaMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsInjective"></om:OMS>
       </om:OMA>
@@ -2893,10 +2893,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingMagmaMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingMagmaMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -2914,10 +2914,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingMagmaMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingMagmaMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -2956,10 +2956,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -2974,10 +2974,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -2992,10 +2992,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -3013,10 +3013,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -3034,10 +3034,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -3055,10 +3055,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -3076,10 +3076,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -3097,10 +3097,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -3124,10 +3124,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -3151,10 +3151,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -3178,10 +3178,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -3205,10 +3205,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -3232,10 +3232,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -3253,10 +3253,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsExtLSet"></om:OMS>
       </om:OMA>
@@ -3274,10 +3274,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpEProd"></om:OMS>
       </om:OMA>
@@ -3295,10 +3295,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpDSum"></om:OMS>
       </om:OMA>
@@ -3316,10 +3316,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpESum"></om:OMS>
       </om:OMA>
@@ -3337,10 +3337,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsTrivialLOpEOne"></om:OMS>
       </om:OMA>
@@ -3358,10 +3358,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnByRing"></om:OMS>
       </om:OMA>
@@ -3379,10 +3379,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagma"></om:OMS>
       </om:OMA>
@@ -3400,10 +3400,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagmaWithZero"></om:OMS>
       </om:OMA>
@@ -3421,10 +3421,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveGroup"></om:OMS>
       </om:OMA>
@@ -3442,10 +3442,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -3463,10 +3463,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -3484,10 +3484,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFreeLeftModule"></om:OMS>
       </om:OMA>
@@ -3505,10 +3505,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsSpaceOfElementsOfMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsHandledByNiceBasis"></om:OMS>
       </om:OMA>
@@ -3545,10 +3545,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingRingMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingRingMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -3563,10 +3563,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingRingMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingRingMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -3581,10 +3581,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingRingMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingRingMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -3602,10 +3602,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingRingMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingRingMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -3623,10 +3623,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingRingMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingRingMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -3644,10 +3644,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingRingMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingRingMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -3665,10 +3665,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingRingMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingRingMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -3686,10 +3686,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingRingMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingRingMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -3707,10 +3707,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingRingMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingRingMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -3728,10 +3728,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingRingMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingRingMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSPGeneralMapping"></om:OMS>
       </om:OMA>
@@ -3749,10 +3749,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingRingMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingRingMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -3770,10 +3770,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingRingMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingRingMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -3791,10 +3791,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingRingMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingRingMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -3812,10 +3812,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingRingMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingRingMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -3833,10 +3833,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingRingMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingRingMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsInjective"></om:OMS>
       </om:OMA>
@@ -3854,10 +3854,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingRingMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingRingMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsInjective"></om:OMS>
       </om:OMA>
@@ -3875,10 +3875,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingRingMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingRingMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -3896,10 +3896,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingRingMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingRingMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -3917,10 +3917,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingRingMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingRingMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -3938,10 +3938,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingRingMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingRingMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -3959,10 +3959,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingRingMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingRingMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsAddition"></om:OMS>
       </om:OMA>
@@ -3980,10 +3980,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingRingMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingRingMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsAddition"></om:OMS>
       </om:OMA>
@@ -4001,10 +4001,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingRingMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingRingMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsZero"></om:OMS>
       </om:OMA>
@@ -4022,10 +4022,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingRingMagmaRing"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsEmbeddingRingMagmaRing"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsZero"></om:OMS>
       </om:OMA>
@@ -4048,13 +4048,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloSpanOfZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -4072,13 +4072,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloSpanOfZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -4096,13 +4096,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloSpanOfZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -4120,13 +4120,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloSpanOfZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -4144,13 +4144,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloSpanOfZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -4168,13 +4168,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloSpanOfZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -4198,13 +4198,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloSpanOfZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -4228,13 +4228,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloSpanOfZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -4258,13 +4258,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloSpanOfZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -4288,13 +4288,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloSpanOfZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -4318,13 +4318,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloSpanOfZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -4342,13 +4342,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloSpanOfZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -4372,13 +4372,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloSpanOfZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -4396,13 +4396,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloSpanOfZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -4426,13 +4426,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloSpanOfZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -4456,13 +4456,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloSpanOfZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -4480,13 +4480,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloSpanOfZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsExtLSet"></om:OMS>
       </om:OMA>
@@ -4504,13 +4504,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloSpanOfZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpDProd"></om:OMS>
       </om:OMA>
@@ -4528,13 +4528,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloSpanOfZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpEProd"></om:OMS>
       </om:OMA>
@@ -4552,13 +4552,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloSpanOfZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpDSum"></om:OMS>
       </om:OMA>
@@ -4576,13 +4576,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloSpanOfZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpESum"></om:OMS>
       </om:OMA>
@@ -4600,13 +4600,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloSpanOfZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsTrivialLOpEOne"></om:OMS>
       </om:OMA>
@@ -4624,13 +4624,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloSpanOfZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnByRing"></om:OMS>
       </om:OMA>
@@ -4648,13 +4648,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloSpanOfZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagma"></om:OMS>
       </om:OMA>
@@ -4672,13 +4672,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloSpanOfZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagma"></om:OMS>
       </om:OMA>
@@ -4696,13 +4696,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloSpanOfZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagmaWithZero"></om:OMS>
       </om:OMA>
@@ -4720,13 +4720,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloSpanOfZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveGroup"></om:OMS>
       </om:OMA>
@@ -4744,13 +4744,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloSpanOfZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -4768,13 +4768,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloSpanOfZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -4792,13 +4792,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloSpanOfZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsLDistributive"></om:OMS>
       </om:OMA>
@@ -4816,13 +4816,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloSpanOfZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsLDistributive"></om:OMS>
       </om:OMA>
@@ -4840,13 +4840,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloSpanOfZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsRDistributive"></om:OMS>
       </om:OMA>
@@ -4864,13 +4864,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloSpanOfZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsRDistributive"></om:OMS>
       </om:OMA>
@@ -4888,13 +4888,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloSpanOfZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFreeLeftModule"></om:OMS>
       </om:OMA>
@@ -4912,13 +4912,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloSpanOfZero"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mgmring" name="IsMagmaRingModuloRelations"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/module.omdoc b/content/http..www.gap-system.org/lib/module.omdoc
index d997c67c66e1f2978e32c0f0829123b945bb5d77..0c9dde1d59ce177964c67234dfdad77281d78a82 100644
--- a/content/http..www.gap-system.org/lib/module.omdoc
+++ b/content/http..www.gap-system.org/lib/module.omdoc
@@ -12,13 +12,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFreeLeftModule"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -36,13 +36,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFreeLeftModule"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -60,13 +60,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFreeLeftModule"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -84,13 +84,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFreeLeftModule"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -108,13 +108,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFreeLeftModule"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -132,13 +132,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFreeLeftModule"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -162,13 +162,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFreeLeftModule"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -192,13 +192,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFreeLeftModule"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -222,13 +222,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFreeLeftModule"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -252,13 +252,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFreeLeftModule"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -282,13 +282,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFreeLeftModule"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -306,13 +306,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFreeLeftModule"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsExtLSet"></om:OMS>
       </om:OMA>
@@ -330,13 +330,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFreeLeftModule"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpEProd"></om:OMS>
       </om:OMA>
@@ -354,13 +354,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFreeLeftModule"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpDSum"></om:OMS>
       </om:OMA>
@@ -378,13 +378,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFreeLeftModule"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpESum"></om:OMS>
       </om:OMA>
@@ -402,13 +402,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFreeLeftModule"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsTrivialLOpEOne"></om:OMS>
       </om:OMA>
@@ -426,13 +426,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFreeLeftModule"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnByRing"></om:OMS>
       </om:OMA>
@@ -450,13 +450,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFreeLeftModule"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagma"></om:OMS>
       </om:OMA>
@@ -474,13 +474,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFreeLeftModule"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagmaWithZero"></om:OMS>
       </om:OMA>
@@ -498,13 +498,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFreeLeftModule"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveGroup"></om:OMS>
       </om:OMA>
@@ -522,13 +522,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFreeLeftModule"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -546,13 +546,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFreeLeftModule"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -561,7 +561,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?type"></import><import from="http://www.gap-system.org/lib?module"></import><constant name="IsHandledByNiceBasis">
+     </constant><import from="http://www.gap-system.org/lib?type"></import><constant name="IsHandledByNiceBasis">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="category"></om:OMS></om:OMOBJ></type>
        
@@ -575,13 +575,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsHandledByNiceBasis"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -596,13 +596,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsHandledByNiceBasis"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -617,13 +617,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsHandledByNiceBasis"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -641,13 +641,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsHandledByNiceBasis"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -665,13 +665,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsHandledByNiceBasis"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -689,13 +689,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsHandledByNiceBasis"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -713,13 +713,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsHandledByNiceBasis"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -737,13 +737,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsHandledByNiceBasis"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -767,13 +767,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsHandledByNiceBasis"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -797,13 +797,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsHandledByNiceBasis"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -827,13 +827,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsHandledByNiceBasis"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -857,13 +857,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsHandledByNiceBasis"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -887,13 +887,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsHandledByNiceBasis"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -911,13 +911,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsHandledByNiceBasis"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsExtLSet"></om:OMS>
       </om:OMA>
@@ -935,13 +935,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsHandledByNiceBasis"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpEProd"></om:OMS>
       </om:OMA>
@@ -959,13 +959,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsHandledByNiceBasis"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpDSum"></om:OMS>
       </om:OMA>
@@ -983,13 +983,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsHandledByNiceBasis"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpESum"></om:OMS>
       </om:OMA>
@@ -1007,13 +1007,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsHandledByNiceBasis"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsTrivialLOpEOne"></om:OMS>
       </om:OMA>
@@ -1031,13 +1031,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsHandledByNiceBasis"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnByRing"></om:OMS>
       </om:OMA>
@@ -1055,13 +1055,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsHandledByNiceBasis"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagma"></om:OMS>
       </om:OMA>
@@ -1079,13 +1079,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsHandledByNiceBasis"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagmaWithZero"></om:OMS>
       </om:OMA>
@@ -1103,13 +1103,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsHandledByNiceBasis"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveGroup"></om:OMS>
       </om:OMA>
@@ -1127,13 +1127,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsHandledByNiceBasis"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -1151,13 +1151,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsHandledByNiceBasis"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -1175,13 +1175,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsHandledByNiceBasis"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFreeLeftModule"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/morpheus.omdoc b/content/http..www.gap-system.org/lib/morpheus.omdoc
index 27305db5eb064f459014883ad96210c27a086edd..8b4a513cb10967ba86c473d1f66c8bb061f9bc33 100644
--- a/content/http..www.gap-system.org/lib/morpheus.omdoc
+++ b/content/http..www.gap-system.org/lib/morpheus.omdoc
@@ -14,7 +14,7 @@
       </om:OMA></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?morpheus"></import><constant name="IsAutomorphismGroup">
+     </constant><constant name="IsAutomorphismGroup">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
@@ -52,10 +52,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="morpheus" name="IsActionHomomorphismAutomGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="morpheus" name="IsActionHomomorphismAutomGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -70,10 +70,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="morpheus" name="IsActionHomomorphismAutomGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="morpheus" name="IsActionHomomorphismAutomGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -88,10 +88,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="morpheus" name="IsActionHomomorphismAutomGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="morpheus" name="IsActionHomomorphismAutomGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -109,10 +109,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="morpheus" name="IsActionHomomorphismAutomGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="morpheus" name="IsActionHomomorphismAutomGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -130,10 +130,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="morpheus" name="IsActionHomomorphismAutomGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="morpheus" name="IsActionHomomorphismAutomGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -151,10 +151,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="morpheus" name="IsActionHomomorphismAutomGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="morpheus" name="IsActionHomomorphismAutomGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -172,10 +172,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="morpheus" name="IsActionHomomorphismAutomGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="morpheus" name="IsActionHomomorphismAutomGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -193,10 +193,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="morpheus" name="IsActionHomomorphismAutomGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="morpheus" name="IsActionHomomorphismAutomGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -214,10 +214,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="morpheus" name="IsActionHomomorphismAutomGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="morpheus" name="IsActionHomomorphismAutomGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -235,10 +235,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="morpheus" name="IsActionHomomorphismAutomGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="morpheus" name="IsActionHomomorphismAutomGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSPGeneralMapping"></om:OMS>
       </om:OMA>
@@ -256,10 +256,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="morpheus" name="IsActionHomomorphismAutomGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="morpheus" name="IsActionHomomorphismAutomGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -277,10 +277,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="morpheus" name="IsActionHomomorphismAutomGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="morpheus" name="IsActionHomomorphismAutomGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -298,10 +298,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="morpheus" name="IsActionHomomorphismAutomGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="morpheus" name="IsActionHomomorphismAutomGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -319,10 +319,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="morpheus" name="IsActionHomomorphismAutomGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="morpheus" name="IsActionHomomorphismAutomGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -340,10 +340,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="morpheus" name="IsActionHomomorphismAutomGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="morpheus" name="IsActionHomomorphismAutomGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -361,10 +361,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="morpheus" name="IsActionHomomorphismAutomGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="morpheus" name="IsActionHomomorphismAutomGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -382,10 +382,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="morpheus" name="IsActionHomomorphismAutomGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="morpheus" name="IsActionHomomorphismAutomGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -403,10 +403,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="morpheus" name="IsActionHomomorphismAutomGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="morpheus" name="IsActionHomomorphismAutomGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -424,10 +424,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="morpheus" name="IsActionHomomorphismAutomGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="morpheus" name="IsActionHomomorphismAutomGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -445,10 +445,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="morpheus" name="IsActionHomomorphismAutomGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="morpheus" name="IsActionHomomorphismAutomGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -466,10 +466,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="morpheus" name="IsActionHomomorphismAutomGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="morpheus" name="IsActionHomomorphismAutomGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -484,10 +484,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="morpheus" name="IsActionHomomorphismAutomGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="morpheus" name="IsActionHomomorphismAutomGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -502,10 +502,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="morpheus" name="IsActionHomomorphismAutomGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="morpheus" name="IsActionHomomorphismAutomGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByBase"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByBase"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/object.omdoc b/content/http..www.gap-system.org/lib/object.omdoc
index 06e06252e591650875632c203695c134eb13a55d..72ef0d10dc5434c232ea22727434d3ed847f008e 100644
--- a/content/http..www.gap-system.org/lib/object.omdoc
+++ b/content/http..www.gap-system.org/lib/object.omdoc
@@ -3,7 +3,7 @@
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="category"></om:OMS></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?object"></import><constant name="IsMutable">
+     </constant><constant name="IsMutable">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="category"></om:OMS></om:OMOBJ></type>
        
@@ -17,13 +17,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="object" name="IsMutable"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="object" name="IsCopyable"></om:OMS>
       </om:OMA>
@@ -166,10 +166,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="object" name="IsPackedElementDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="object" name="IsPackedElementDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/objset.omdoc b/content/http..www.gap-system.org/lib/objset.omdoc
index a84efb9108bfc756adcf277a4a096c0d1296dce6..579138df9db52a67f0ba50b0a231ca0c7bf5b465 100644
--- a/content/http..www.gap-system.org/lib/objset.omdoc
+++ b/content/http..www.gap-system.org/lib/objset.omdoc
@@ -12,10 +12,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="objset" name="IsObjMap"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="objset" name="IsObjMap"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsInternalRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsInternalRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -35,10 +35,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="objset" name="IsObjSet"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="objset" name="IsObjSet"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsInternalRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsInternalRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/oprt.omdoc b/content/http..www.gap-system.org/lib/oprt.omdoc
index 6632781567c3a2babfa2b14e81b0e75c3641a6f8..4515d54d663e707edcdcc4c0da73d8869395283a 100644
--- a/content/http..www.gap-system.org/lib/oprt.omdoc
+++ b/content/http..www.gap-system.org/lib/oprt.omdoc
@@ -20,13 +20,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSet"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -44,13 +44,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSet"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -68,13 +68,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSet"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -92,13 +92,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSet"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -116,13 +116,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSet"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -131,7 +131,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?oprt"></import><import from="http://www.gap-system.org/lib?magma"></import><import from="http://www.gap-system.org/lib?ctblfuns"></import><import from="http://www.gap-system.org/lib?ctbl"></import><constant name="IsTransitive">
+     </constant><import from="http://www.gap-system.org/lib?magma"></import><import from="http://www.gap-system.org/lib?ctblfuns"></import><import from="http://www.gap-system.org/lib?ctbl"></import><constant name="IsTransitive">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
@@ -185,10 +185,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -203,10 +203,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -221,10 +221,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -242,10 +242,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -263,10 +263,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -284,10 +284,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -305,10 +305,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -326,10 +326,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -347,10 +347,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -368,10 +368,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSPGeneralMapping"></om:OMS>
       </om:OMA>
@@ -389,10 +389,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -410,10 +410,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -431,10 +431,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -452,10 +452,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -473,10 +473,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -494,10 +494,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -515,10 +515,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -536,10 +536,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -557,10 +557,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -578,10 +578,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -599,10 +599,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -622,10 +622,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsBlocksHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsBlocksHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -640,10 +640,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsBlocksHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsBlocksHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -658,10 +658,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsBlocksHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsBlocksHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -679,10 +679,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsBlocksHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsBlocksHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -700,10 +700,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsBlocksHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsBlocksHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -721,10 +721,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsBlocksHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsBlocksHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -742,10 +742,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsBlocksHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsBlocksHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -763,10 +763,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsBlocksHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsBlocksHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -784,10 +784,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsBlocksHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsBlocksHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -805,10 +805,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsBlocksHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsBlocksHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSPGeneralMapping"></om:OMS>
       </om:OMA>
@@ -826,10 +826,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsBlocksHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsBlocksHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -847,10 +847,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsBlocksHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsBlocksHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -868,10 +868,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsBlocksHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsBlocksHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -889,10 +889,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsBlocksHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsBlocksHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -910,10 +910,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsBlocksHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsBlocksHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -931,10 +931,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsBlocksHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsBlocksHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -952,10 +952,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsBlocksHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsBlocksHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -973,10 +973,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsBlocksHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsBlocksHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -994,10 +994,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsBlocksHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsBlocksHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -1015,10 +1015,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsBlocksHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsBlocksHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -1036,10 +1036,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsBlocksHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsBlocksHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1054,10 +1054,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsBlocksHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsBlocksHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1077,10 +1077,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSetDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSetDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1095,10 +1095,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSetDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSetDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1113,10 +1113,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSetDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSetDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -1134,10 +1134,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSetDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSetDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -1155,10 +1155,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSetDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSetDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1176,10 +1176,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSetDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSetDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1197,10 +1197,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSetDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSetDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -1218,10 +1218,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSetDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSetDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSet"></om:OMS>
       </om:OMA>
@@ -1252,10 +1252,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSubset"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSubset"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1270,10 +1270,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSubset"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSubset"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1288,10 +1288,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSubset"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSubset"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -1309,10 +1309,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSubset"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSubset"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -1330,10 +1330,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSubset"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSubset"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1351,10 +1351,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSubset"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSubset"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1372,10 +1372,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSubset"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSubset"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -1393,10 +1393,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSubset"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSubset"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSet"></om:OMS>
       </om:OMA>
@@ -1419,10 +1419,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalOrbit"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalOrbit"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1437,10 +1437,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalOrbit"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalOrbit"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1455,10 +1455,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalOrbit"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalOrbit"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -1476,10 +1476,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalOrbit"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalOrbit"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -1497,10 +1497,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalOrbit"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalOrbit"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1518,10 +1518,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalOrbit"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalOrbit"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1539,10 +1539,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalOrbit"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalOrbit"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -1560,10 +1560,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalOrbit"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalOrbit"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSet"></om:OMS>
       </om:OMA>
@@ -1581,10 +1581,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalOrbit"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalOrbit"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSubset"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSubset"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1620,10 +1620,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismSubset"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismSubset"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1638,10 +1638,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismSubset"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismSubset"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1656,10 +1656,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismSubset"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismSubset"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -1677,10 +1677,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismSubset"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismSubset"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -1698,10 +1698,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismSubset"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismSubset"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -1719,10 +1719,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismSubset"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismSubset"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -1740,10 +1740,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismSubset"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismSubset"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -1761,10 +1761,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismSubset"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismSubset"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -1782,10 +1782,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismSubset"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismSubset"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -1803,10 +1803,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismSubset"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismSubset"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSPGeneralMapping"></om:OMS>
       </om:OMA>
@@ -1824,10 +1824,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismSubset"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismSubset"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -1845,10 +1845,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismSubset"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismSubset"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -1866,10 +1866,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismSubset"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismSubset"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -1887,10 +1887,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismSubset"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismSubset"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -1908,10 +1908,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismSubset"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismSubset"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -1929,10 +1929,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismSubset"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismSubset"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -1950,10 +1950,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismSubset"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismSubset"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -1971,10 +1971,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismSubset"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismSubset"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -1992,10 +1992,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismSubset"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismSubset"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -2013,10 +2013,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismSubset"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismSubset"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -2034,10 +2034,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismSubset"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismSubset"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -2052,10 +2052,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismSubset"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismSubset"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -2099,10 +2099,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByBase"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByBase"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -2117,10 +2117,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByBase"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByBase"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -2135,10 +2135,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByBase"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByBase"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -2156,10 +2156,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByBase"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByBase"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -2177,10 +2177,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByBase"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByBase"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -2198,10 +2198,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByBase"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByBase"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -2219,10 +2219,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByBase"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByBase"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -2240,10 +2240,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByBase"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByBase"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -2261,10 +2261,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByBase"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByBase"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -2282,10 +2282,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByBase"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByBase"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSPGeneralMapping"></om:OMS>
       </om:OMA>
@@ -2303,10 +2303,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByBase"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByBase"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -2324,10 +2324,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByBase"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByBase"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -2345,10 +2345,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByBase"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByBase"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -2366,10 +2366,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByBase"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByBase"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -2387,10 +2387,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByBase"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByBase"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -2408,10 +2408,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByBase"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByBase"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -2429,10 +2429,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByBase"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByBase"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -2450,10 +2450,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByBase"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByBase"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -2471,10 +2471,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByBase"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByBase"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -2492,10 +2492,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByBase"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByBase"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -2513,10 +2513,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByBase"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByBase"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -2531,10 +2531,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByBase"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByBase"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -2602,10 +2602,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSetByActorsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSetByActorsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -2620,10 +2620,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSetByActorsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSetByActorsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -2638,10 +2638,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSetByActorsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSetByActorsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -2659,10 +2659,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSetByActorsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSetByActorsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -2680,10 +2680,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSetByActorsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSetByActorsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -2701,10 +2701,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSetByActorsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSetByActorsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -2722,10 +2722,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSetByActorsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSetByActorsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -2743,10 +2743,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSetByActorsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSetByActorsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSet"></om:OMS>
       </om:OMA>
@@ -2793,10 +2793,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByActors"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByActors"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -2811,10 +2811,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByActors"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByActors"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -2829,10 +2829,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByActors"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByActors"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -2850,10 +2850,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByActors"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByActors"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -2871,10 +2871,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByActors"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByActors"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -2892,10 +2892,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByActors"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByActors"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -2913,10 +2913,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByActors"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByActors"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -2934,10 +2934,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByActors"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByActors"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -2955,10 +2955,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByActors"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByActors"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -2976,10 +2976,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByActors"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByActors"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSPGeneralMapping"></om:OMS>
       </om:OMA>
@@ -2997,10 +2997,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByActors"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByActors"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -3018,10 +3018,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByActors"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByActors"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -3039,10 +3039,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByActors"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByActors"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -3060,10 +3060,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByActors"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByActors"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -3081,10 +3081,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByActors"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByActors"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -3102,10 +3102,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByActors"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByActors"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -3123,10 +3123,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByActors"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByActors"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -3144,10 +3144,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByActors"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByActors"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -3165,10 +3165,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByActors"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByActors"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -3186,10 +3186,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByActors"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByActors"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -3207,10 +3207,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByActors"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByActors"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -3225,10 +3225,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByActors"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphismByActors"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -3344,10 +3344,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsProjectiveActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsProjectiveActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -3362,10 +3362,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsProjectiveActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsProjectiveActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -3380,10 +3380,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsProjectiveActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsProjectiveActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -3401,10 +3401,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsProjectiveActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsProjectiveActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -3422,10 +3422,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsProjectiveActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsProjectiveActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -3443,10 +3443,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsProjectiveActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsProjectiveActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -3464,10 +3464,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsProjectiveActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsProjectiveActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -3485,10 +3485,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsProjectiveActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsProjectiveActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -3506,10 +3506,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsProjectiveActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsProjectiveActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -3527,10 +3527,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsProjectiveActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsProjectiveActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSPGeneralMapping"></om:OMS>
       </om:OMA>
@@ -3548,10 +3548,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsProjectiveActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsProjectiveActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -3569,10 +3569,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsProjectiveActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsProjectiveActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -3590,10 +3590,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsProjectiveActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsProjectiveActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -3611,10 +3611,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsProjectiveActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsProjectiveActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -3632,10 +3632,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsProjectiveActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsProjectiveActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -3653,10 +3653,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsProjectiveActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsProjectiveActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -3674,10 +3674,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsProjectiveActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsProjectiveActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -3695,10 +3695,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsProjectiveActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsProjectiveActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -3716,10 +3716,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsProjectiveActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsProjectiveActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -3737,10 +3737,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsProjectiveActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsProjectiveActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -3758,10 +3758,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsProjectiveActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsProjectiveActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -3776,10 +3776,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsProjectiveActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsProjectiveActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -3807,10 +3807,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsLinearActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsLinearActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -3825,10 +3825,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsLinearActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsLinearActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -3843,10 +3843,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsLinearActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsLinearActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -3864,10 +3864,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsLinearActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsLinearActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -3885,10 +3885,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsLinearActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsLinearActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -3906,10 +3906,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsLinearActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsLinearActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -3927,10 +3927,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsLinearActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsLinearActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -3948,10 +3948,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsLinearActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsLinearActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -3969,10 +3969,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsLinearActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsLinearActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -3990,10 +3990,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsLinearActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsLinearActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSPGeneralMapping"></om:OMS>
       </om:OMA>
@@ -4011,10 +4011,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsLinearActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsLinearActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -4032,10 +4032,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsLinearActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsLinearActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -4053,10 +4053,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsLinearActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsLinearActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -4074,10 +4074,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsLinearActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsLinearActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -4095,10 +4095,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsLinearActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsLinearActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -4116,10 +4116,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsLinearActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsLinearActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -4137,10 +4137,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsLinearActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsLinearActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -4158,10 +4158,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsLinearActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsLinearActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -4179,10 +4179,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsLinearActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsLinearActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -4200,10 +4200,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsLinearActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsLinearActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -4221,10 +4221,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsLinearActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsLinearActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -4239,10 +4239,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsLinearActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsLinearActionHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -4382,13 +4382,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSetByPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -4406,13 +4406,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSetByPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -4430,13 +4430,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSetByPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -4454,13 +4454,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSetByPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -4478,13 +4478,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSetByPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -4502,13 +4502,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSetByPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsExternalSet"></om:OMS>
       </om:OMA>
@@ -4531,10 +4531,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsConstituentHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsConstituentHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -4549,10 +4549,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsConstituentHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsConstituentHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -4567,10 +4567,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsConstituentHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsConstituentHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -4588,10 +4588,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsConstituentHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsConstituentHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -4609,10 +4609,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsConstituentHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsConstituentHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -4630,10 +4630,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsConstituentHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsConstituentHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -4651,10 +4651,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsConstituentHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsConstituentHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -4672,10 +4672,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsConstituentHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsConstituentHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -4693,10 +4693,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsConstituentHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsConstituentHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -4714,10 +4714,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsConstituentHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsConstituentHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSPGeneralMapping"></om:OMS>
       </om:OMA>
@@ -4735,10 +4735,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsConstituentHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsConstituentHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -4756,10 +4756,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsConstituentHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsConstituentHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -4777,10 +4777,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsConstituentHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsConstituentHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -4798,10 +4798,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsConstituentHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsConstituentHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSingleValued"></om:OMS>
       </om:OMA>
@@ -4819,10 +4819,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsConstituentHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsConstituentHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -4840,10 +4840,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsConstituentHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsConstituentHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -4861,10 +4861,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsConstituentHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsConstituentHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -4882,10 +4882,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsConstituentHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsConstituentHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsOne"></om:OMS>
       </om:OMA>
@@ -4903,10 +4903,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsConstituentHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsConstituentHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -4924,10 +4924,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsConstituentHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsConstituentHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsInverses"></om:OMS>
       </om:OMA>
@@ -4945,10 +4945,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsConstituentHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsConstituentHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ghom" name="IsPreimagesByAsGroupGeneralMappingByImages"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -4963,10 +4963,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsConstituentHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsConstituentHomomorphism"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oprt" name="IsActionHomomorphism"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/orders.omdoc b/content/http..www.gap-system.org/lib/orders.omdoc
index e55cf8835d7adca1cd3da52f666971486409741b..5f9068495ba05f734065fd1b1fddf6bc2f4cc5ee 100644
--- a/content/http..www.gap-system.org/lib/orders.omdoc
+++ b/content/http..www.gap-system.org/lib/orders.omdoc
@@ -11,7 +11,7 @@
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="category"></om:OMS></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?orders"></import><constant name="LessThanFunction">
+     </constant><constant name="LessThanFunction">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
diff --git a/content/http..www.gap-system.org/lib/padics.omdoc b/content/http..www.gap-system.org/lib/padics.omdoc
index 7fb235c83302bbd945df90a83557c911d23bd2af..8e619a5760e82893c332d2d001db8215b97fb58f 100644
--- a/content/http..www.gap-system.org/lib/padics.omdoc
+++ b/content/http..www.gap-system.org/lib/padics.omdoc
@@ -12,13 +12,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="padics" name="IsPadicNumber"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -36,13 +36,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="padics" name="IsPadicNumber"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -60,13 +60,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="padics" name="IsPadicNumber"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -84,13 +84,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="padics" name="IsPadicNumber"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -108,13 +108,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="padics" name="IsPadicNumber"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -132,13 +132,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="padics" name="IsPadicNumber"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -156,13 +156,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="padics" name="IsPadicNumber"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -180,13 +180,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="padics" name="IsPadicNumber"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -204,13 +204,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="padics" name="IsPadicNumber"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -228,13 +228,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="padics" name="IsPadicNumber"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -252,13 +252,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="padics" name="IsPadicNumber"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -276,13 +276,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="padics" name="IsPadicNumber"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsCommutativeElement"></om:OMS>
       </om:OMA>
@@ -291,7 +291,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?list"></import><import from="http://www.gap-system.org/lib?padics"></import><constant name="IsPadicNumberList">
+     </constant><import from="http://www.gap-system.org/lib?list"></import><constant name="IsPadicNumberList">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="filter"></om:OMS></om:OMOBJ></type>
        <definition><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
@@ -367,13 +367,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="padics" name="IsPurePadicNumber"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -391,13 +391,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="padics" name="IsPurePadicNumber"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -415,13 +415,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="padics" name="IsPurePadicNumber"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -439,13 +439,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="padics" name="IsPurePadicNumber"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -463,13 +463,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="padics" name="IsPurePadicNumber"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -487,13 +487,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="padics" name="IsPurePadicNumber"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -511,13 +511,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="padics" name="IsPurePadicNumber"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -535,13 +535,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="padics" name="IsPurePadicNumber"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -559,13 +559,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="padics" name="IsPurePadicNumber"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -583,13 +583,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="padics" name="IsPurePadicNumber"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -607,13 +607,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="padics" name="IsPurePadicNumber"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -631,13 +631,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="padics" name="IsPurePadicNumber"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsCommutativeElement"></om:OMS>
       </om:OMA>
@@ -655,13 +655,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="padics" name="IsPurePadicNumber"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="padics" name="IsPadicNumber"></om:OMS>
       </om:OMA>
@@ -692,13 +692,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="padics" name="IsPadicExtensionNumber"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -716,13 +716,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="padics" name="IsPadicExtensionNumber"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -740,13 +740,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="padics" name="IsPadicExtensionNumber"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -764,13 +764,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="padics" name="IsPadicExtensionNumber"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -788,13 +788,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="padics" name="IsPadicExtensionNumber"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -812,13 +812,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="padics" name="IsPadicExtensionNumber"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -836,13 +836,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="padics" name="IsPadicExtensionNumber"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -860,13 +860,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="padics" name="IsPadicExtensionNumber"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -884,13 +884,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="padics" name="IsPadicExtensionNumber"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -908,13 +908,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="padics" name="IsPadicExtensionNumber"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -932,13 +932,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="padics" name="IsPadicExtensionNumber"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -956,13 +956,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="padics" name="IsPadicExtensionNumber"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsCommutativeElement"></om:OMS>
       </om:OMA>
@@ -980,13 +980,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="padics" name="IsPadicExtensionNumber"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="padics" name="IsPadicNumber"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/pcgs.omdoc b/content/http..www.gap-system.org/lib/pcgs.omdoc
index 1bc7293e02878d4730f80b3a4dccd212a115cca6..457ad022fb2bdc36e8351a2b36a9482ac46a0162 100644
--- a/content/http..www.gap-system.org/lib/pcgs.omdoc
+++ b/content/http..www.gap-system.org/lib/pcgs.omdoc
@@ -12,10 +12,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgsDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgsDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -30,10 +30,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgsDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgsDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -53,13 +53,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsGeneralPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsList"></om:OMS>
       </om:OMA>
@@ -77,13 +77,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsGeneralPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDenseList"></om:OMS>
       </om:OMA>
@@ -101,13 +101,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsGeneralPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsHomogeneousList"></om:OMS>
       </om:OMA>
@@ -125,13 +125,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsGeneralPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oper" name="IsNoImmediateMethodsObject"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oper" name="IsNoImmediateMethodsObject"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -146,13 +146,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsGeneralPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -170,13 +170,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsGeneralPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -194,13 +194,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsGeneralPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsFinite"></om:OMS>
       </om:OMA>
@@ -218,13 +218,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsGeneralPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsFinite"></om:OMS>
       </om:OMA>
@@ -242,13 +242,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsGeneralPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsConstantTimeAccessList"></om:OMS>
       </om:OMA>
@@ -266,13 +266,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsGeneralPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -290,13 +290,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsGeneralPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -314,13 +314,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsGeneralPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -338,13 +338,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsGeneralPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -368,13 +368,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsGeneralPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -392,13 +392,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsGeneralPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -422,13 +422,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsGeneralPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -452,13 +452,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsGeneralPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -482,13 +482,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsGeneralPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -503,7 +503,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?pcgs"></import><constant name="IsFiniteOrdersPcgs">
+     </constant><constant name="IsFiniteOrdersPcgs">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
@@ -525,13 +525,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsModuloPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsList"></om:OMS>
       </om:OMA>
@@ -549,13 +549,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsModuloPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDenseList"></om:OMS>
       </om:OMA>
@@ -573,13 +573,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsModuloPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsHomogeneousList"></om:OMS>
       </om:OMA>
@@ -597,13 +597,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsModuloPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oper" name="IsNoImmediateMethodsObject"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oper" name="IsNoImmediateMethodsObject"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -618,13 +618,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsModuloPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -642,13 +642,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsModuloPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -666,13 +666,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsModuloPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsFinite"></om:OMS>
       </om:OMA>
@@ -690,13 +690,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsModuloPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsFinite"></om:OMS>
       </om:OMA>
@@ -714,13 +714,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsModuloPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsConstantTimeAccessList"></om:OMS>
       </om:OMA>
@@ -738,13 +738,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsModuloPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -762,13 +762,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsModuloPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -786,13 +786,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsModuloPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -810,13 +810,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsModuloPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -840,13 +840,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsModuloPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -864,13 +864,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsModuloPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -894,13 +894,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsModuloPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -924,13 +924,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsModuloPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -954,13 +954,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsModuloPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -984,13 +984,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsModuloPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsGeneralPcgs"></om:OMS>
       </om:OMA>
@@ -1021,13 +1021,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsList"></om:OMS>
       </om:OMA>
@@ -1045,13 +1045,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDenseList"></om:OMS>
       </om:OMA>
@@ -1069,13 +1069,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsHomogeneousList"></om:OMS>
       </om:OMA>
@@ -1093,13 +1093,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oper" name="IsNoImmediateMethodsObject"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oper" name="IsNoImmediateMethodsObject"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1114,13 +1114,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -1138,13 +1138,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -1162,13 +1162,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsFinite"></om:OMS>
       </om:OMA>
@@ -1186,13 +1186,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsFinite"></om:OMS>
       </om:OMA>
@@ -1210,13 +1210,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsConstantTimeAccessList"></om:OMS>
       </om:OMA>
@@ -1234,13 +1234,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1258,13 +1258,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1282,13 +1282,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -1306,13 +1306,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1336,13 +1336,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -1360,13 +1360,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1390,13 +1390,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1420,13 +1420,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1450,13 +1450,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1480,13 +1480,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsGeneralPcgs"></om:OMS>
       </om:OMA>
@@ -1504,13 +1504,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsModuloPcgs"></om:OMS>
       </om:OMA>
@@ -1549,13 +1549,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgsFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsFamily"></om:OMS>
       </om:OMA>
@@ -1682,10 +1682,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsEnumeratorByPcgsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsEnumeratorByPcgsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1700,10 +1700,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsEnumeratorByPcgsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsEnumeratorByPcgsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1787,10 +1787,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgsByPcgsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgsByPcgsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1805,10 +1805,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgsByPcgsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgsByPcgsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1823,10 +1823,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgsByPcgsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgsByPcgsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgsDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgsDefaultRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1841,10 +1841,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgsByPcgsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgsByPcgsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsFiniteOrdersPcgs"></om:OMS>
       </om:OMA>
@@ -1862,10 +1862,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgsByPcgsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgsByPcgsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsFiniteOrdersPcgs"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/pcgsind.omdoc b/content/http..www.gap-system.org/lib/pcgsind.omdoc
index fd09868df6741e1bd1f89617c445cc4d6f5cd889..02ecf98fe0bd1cfb6f02c87c2228288eaa9f13e4 100644
--- a/content/http..www.gap-system.org/lib/pcgsind.omdoc
+++ b/content/http..www.gap-system.org/lib/pcgsind.omdoc
@@ -12,13 +12,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgsind" name="IsInducedPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsList"></om:OMS>
       </om:OMA>
@@ -36,13 +36,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgsind" name="IsInducedPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDenseList"></om:OMS>
       </om:OMA>
@@ -60,13 +60,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgsind" name="IsInducedPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsHomogeneousList"></om:OMS>
       </om:OMA>
@@ -84,13 +84,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgsind" name="IsInducedPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oper" name="IsNoImmediateMethodsObject"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="oper" name="IsNoImmediateMethodsObject"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -105,13 +105,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgsind" name="IsInducedPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -129,13 +129,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgsind" name="IsInducedPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -153,13 +153,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgsind" name="IsInducedPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsFinite"></om:OMS>
       </om:OMA>
@@ -177,13 +177,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgsind" name="IsInducedPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsFinite"></om:OMS>
       </om:OMA>
@@ -201,13 +201,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgsind" name="IsInducedPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsConstantTimeAccessList"></om:OMS>
       </om:OMA>
@@ -225,13 +225,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgsind" name="IsInducedPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -249,13 +249,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgsind" name="IsInducedPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -273,13 +273,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgsind" name="IsInducedPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -297,13 +297,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgsind" name="IsInducedPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -327,13 +327,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgsind" name="IsInducedPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -351,13 +351,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgsind" name="IsInducedPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -381,13 +381,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgsind" name="IsInducedPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -411,13 +411,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgsind" name="IsInducedPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -441,13 +441,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgsind" name="IsInducedPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -471,13 +471,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgsind" name="IsInducedPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsGeneralPcgs"></om:OMS>
       </om:OMA>
@@ -495,13 +495,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgsind" name="IsInducedPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsModuloPcgs"></om:OMS>
       </om:OMA>
@@ -519,13 +519,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgsind" name="IsInducedPcgs"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgs"></om:OMS>
       </om:OMA>
@@ -534,7 +534,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?pcgsind"></import><constant name="ParentPcgs">
+     </constant><constant name="ParentPcgs">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
@@ -556,10 +556,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsind" name="IsInducedPcgsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsind" name="IsInducedPcgsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -574,10 +574,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsind" name="IsInducedPcgsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsind" name="IsInducedPcgsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -592,10 +592,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsind" name="IsInducedPcgsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsind" name="IsInducedPcgsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgsDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgsDefaultRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -711,10 +711,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsind" name="IsSubsetInducedPcgsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsind" name="IsSubsetInducedPcgsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -729,10 +729,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsind" name="IsSubsetInducedPcgsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsind" name="IsSubsetInducedPcgsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -747,10 +747,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsind" name="IsSubsetInducedPcgsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsind" name="IsSubsetInducedPcgsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgsDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgsDefaultRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -765,10 +765,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsind" name="IsSubsetInducedPcgsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsind" name="IsSubsetInducedPcgsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsind" name="IsInducedPcgsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsind" name="IsInducedPcgsRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -812,10 +812,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsind" name="IsTailInducedPcgsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsind" name="IsTailInducedPcgsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -830,10 +830,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsind" name="IsTailInducedPcgsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsind" name="IsTailInducedPcgsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -848,10 +848,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsind" name="IsTailInducedPcgsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsind" name="IsTailInducedPcgsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgsDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgsDefaultRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -866,10 +866,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsind" name="IsTailInducedPcgsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsind" name="IsTailInducedPcgsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsind" name="IsInducedPcgsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsind" name="IsInducedPcgsRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -884,10 +884,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsind" name="IsTailInducedPcgsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsind" name="IsTailInducedPcgsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsind" name="IsSubsetInducedPcgsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsind" name="IsSubsetInducedPcgsRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/pcgsmodu.omdoc b/content/http..www.gap-system.org/lib/pcgsmodu.omdoc
index 4fe4901eb65046e6f3cdaa21fff790b6decffc98..8f9c77272d0f925b92a9ace618e865ea1581e20b 100644
--- a/content/http..www.gap-system.org/lib/pcgsmodu.omdoc
+++ b/content/http..www.gap-system.org/lib/pcgsmodu.omdoc
@@ -12,10 +12,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsModuloPcgsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsModuloPcgsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -30,10 +30,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsModuloPcgsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsModuloPcgsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -48,10 +48,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsModuloPcgsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsModuloPcgsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgsDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgsDefaultRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -73,7 +73,7 @@
       </om:OMA></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?pcgsmodu"></import><constant name="IsModuloTailPcgsRep">
+     </constant><constant name="IsModuloTailPcgsRep">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="filter"></om:OMS></om:OMOBJ></type>
        
@@ -87,10 +87,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsModuloTailPcgsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsModuloTailPcgsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -105,10 +105,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsModuloTailPcgsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsModuloTailPcgsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -123,10 +123,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsModuloTailPcgsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsModuloTailPcgsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgsDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgsDefaultRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -141,10 +141,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsModuloTailPcgsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsModuloTailPcgsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsModuloPcgsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsModuloPcgsRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -164,10 +164,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsModuloTailPcgsByListRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsModuloTailPcgsByListRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -182,10 +182,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsModuloTailPcgsByListRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsModuloTailPcgsByListRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -200,10 +200,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsModuloTailPcgsByListRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsModuloTailPcgsByListRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgsDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgsDefaultRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -218,10 +218,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsModuloTailPcgsByListRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsModuloTailPcgsByListRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsModuloPcgsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsModuloPcgsRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -236,10 +236,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsModuloTailPcgsByListRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsModuloTailPcgsByListRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsModuloTailPcgsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsModuloTailPcgsRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -259,10 +259,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsNumeratorParentLayersForExponentsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsNumeratorParentLayersForExponentsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -277,10 +277,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsNumeratorParentLayersForExponentsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsNumeratorParentLayersForExponentsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -295,10 +295,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsNumeratorParentLayersForExponentsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsNumeratorParentLayersForExponentsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgsDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgsDefaultRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -313,10 +313,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsNumeratorParentLayersForExponentsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsNumeratorParentLayersForExponentsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsModuloPcgsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsModuloPcgsRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -344,10 +344,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsNumeratorParentForExponentsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsNumeratorParentForExponentsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -362,10 +362,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsNumeratorParentForExponentsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsNumeratorParentForExponentsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -380,10 +380,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsNumeratorParentForExponentsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsNumeratorParentForExponentsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgsDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgsDefaultRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -398,10 +398,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsNumeratorParentForExponentsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsNumeratorParentForExponentsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsModuloPcgsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsModuloPcgsRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -453,10 +453,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsSubsetInducedNumeratorModuloTailPcgsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsSubsetInducedNumeratorModuloTailPcgsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -471,10 +471,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsSubsetInducedNumeratorModuloTailPcgsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsSubsetInducedNumeratorModuloTailPcgsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -489,10 +489,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsSubsetInducedNumeratorModuloTailPcgsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsSubsetInducedNumeratorModuloTailPcgsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgsDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgsDefaultRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -507,10 +507,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsSubsetInducedNumeratorModuloTailPcgsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsSubsetInducedNumeratorModuloTailPcgsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsModuloPcgsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsModuloPcgsRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -525,10 +525,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsSubsetInducedNumeratorModuloTailPcgsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsSubsetInducedNumeratorModuloTailPcgsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsModuloTailPcgsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsmodu" name="IsModuloTailPcgsRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/pcgspcg.omdoc b/content/http..www.gap-system.org/lib/pcgspcg.omdoc
index 33cc530f6b173dce2ed6a65b1bdeee8d0b886bae..e0bbb6e689e08c9280b3f1ce29eec9f0a0bf2b00 100644
--- a/content/http..www.gap-system.org/lib/pcgspcg.omdoc
+++ b/content/http..www.gap-system.org/lib/pcgspcg.omdoc
@@ -20,10 +20,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgspcg" name="IsUnsortedPcgsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgspcg" name="IsUnsortedPcgsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -38,10 +38,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgspcg" name="IsUnsortedPcgsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgspcg" name="IsUnsortedPcgsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -56,16 +56,16 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgspcg" name="IsUnsortedPcgsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgspcg" name="IsUnsortedPcgsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgsDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgsDefaultRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?pcgspcg"></import><constant name="IsSortedPcgsRep">
+     </constant><constant name="IsSortedPcgsRep">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="filter"></om:OMS></om:OMOBJ></type>
        
@@ -79,10 +79,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgspcg" name="IsSortedPcgsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgspcg" name="IsSortedPcgsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -97,10 +97,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgspcg" name="IsSortedPcgsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgspcg" name="IsSortedPcgsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -115,10 +115,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgspcg" name="IsSortedPcgsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgspcg" name="IsSortedPcgsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgsDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgsDefaultRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -133,10 +133,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgspcg" name="IsSortedPcgsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgspcg" name="IsSortedPcgsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgspcg" name="IsUnsortedPcgsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgspcg" name="IsUnsortedPcgsRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/pcgsperm.omdoc b/content/http..www.gap-system.org/lib/pcgsperm.omdoc
index b3562a17de68bf643ec0dd8ea1b107bd7c12f1d7..6cce250a4ad012881a73d2b7cc2597b6618e4e36 100644
--- a/content/http..www.gap-system.org/lib/pcgsperm.omdoc
+++ b/content/http..www.gap-system.org/lib/pcgsperm.omdoc
@@ -12,10 +12,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsPcgsPermGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsPcgsPermGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -30,10 +30,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsPcgsPermGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsPcgsPermGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -48,10 +48,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsPcgsPermGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsPcgsPermGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgsDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgsDefaultRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -66,10 +66,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsPcgsPermGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsPcgsPermGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsFiniteOrdersPcgs"></om:OMS>
       </om:OMA>
@@ -87,10 +87,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsPcgsPermGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsPcgsPermGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsFiniteOrdersPcgs"></om:OMS>
       </om:OMA>
@@ -113,10 +113,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -134,10 +134,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -155,10 +155,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsFinite"></om:OMS>
       </om:OMA>
@@ -176,10 +176,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsFinite"></om:OMS>
       </om:OMA>
@@ -197,10 +197,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="CanEasilyCompareElements"></om:OMS>
       </om:OMA>
@@ -218,10 +218,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="CanEasilyCompareElements"></om:OMS>
       </om:OMA>
@@ -239,10 +239,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="CanEasilySortElements"></om:OMS>
       </om:OMA>
@@ -260,10 +260,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="CanEasilySortElements"></om:OMS>
       </om:OMA>
@@ -281,10 +281,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="coll" name="CanComputeSize"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="coll" name="CanComputeSize"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -299,10 +299,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -320,10 +320,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -341,10 +341,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -362,10 +362,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -389,10 +389,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -410,10 +410,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -437,10 +437,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -464,10 +464,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -491,10 +491,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -518,10 +518,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -545,10 +545,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -572,10 +572,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -593,10 +593,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -620,10 +620,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagma"></om:OMS>
       </om:OMA>
@@ -641,10 +641,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithOne"></om:OMS>
       </om:OMA>
@@ -662,10 +662,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithInversesIfNonzero"></om:OMS>
       </om:OMA>
@@ -683,10 +683,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithInverses"></om:OMS>
       </om:OMA>
@@ -704,10 +704,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsGeneratorsOfMagmaWithInverses"></om:OMS>
       </om:OMA>
@@ -725,10 +725,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsGeneratorsOfMagmaWithInverses"></om:OMS>
       </om:OMA>
@@ -746,10 +746,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsAssociative"></om:OMS>
       </om:OMA>
@@ -767,10 +767,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsAssociative"></om:OMS>
       </om:OMA>
@@ -788,10 +788,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="MultiplicativeNeutralElement"></om:OMS>
       </om:OMA>
@@ -809,10 +809,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsGeneratorsOfSemigroup"></om:OMS>
       </om:OMA>
@@ -830,10 +830,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsGeneratorsOfSemigroup"></om:OMS>
       </om:OMA>
@@ -851,10 +851,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsSimpleSemigroup"></om:OMS>
       </om:OMA>
@@ -872,10 +872,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsSimpleSemigroup"></om:OMS>
       </om:OMA>
@@ -893,10 +893,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsRegularSemigroup"></om:OMS>
       </om:OMA>
@@ -914,10 +914,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsRegularSemigroup"></om:OMS>
       </om:OMA>
@@ -935,10 +935,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsInverseSemigroup"></om:OMS>
       </om:OMA>
@@ -956,10 +956,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsInverseSemigroup"></om:OMS>
       </om:OMA>
@@ -977,10 +977,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsCompletelyRegularSemigroup"></om:OMS>
       </om:OMA>
@@ -998,10 +998,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsCompletelyRegularSemigroup"></om:OMS>
       </om:OMA>
@@ -1019,10 +1019,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsCompletelySimpleSemigroup"></om:OMS>
       </om:OMA>
@@ -1040,10 +1040,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsCompletelySimpleSemigroup"></om:OMS>
       </om:OMA>
@@ -1061,10 +1061,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsGroupAsSemigroup"></om:OMS>
       </om:OMA>
@@ -1082,10 +1082,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsGroupAsSemigroup"></om:OMS>
       </om:OMA>
@@ -1103,10 +1103,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsMonoidAsSemigroup"></om:OMS>
       </om:OMA>
@@ -1124,10 +1124,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsMonoidAsSemigroup"></om:OMS>
       </om:OMA>
@@ -1145,10 +1145,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsOrthodoxSemigroup"></om:OMS>
       </om:OMA>
@@ -1166,10 +1166,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsOrthodoxSemigroup"></om:OMS>
       </om:OMA>
@@ -1187,10 +1187,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grp" name="IsFinitelyGeneratedGroup"></om:OMS>
       </om:OMA>
@@ -1208,10 +1208,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grp" name="IsFinitelyGeneratedGroup"></om:OMS>
       </om:OMA>
@@ -1229,10 +1229,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grp" name="IsSubsetLocallyFiniteGroup"></om:OMS>
       </om:OMA>
@@ -1250,10 +1250,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grp" name="IsSubsetLocallyFiniteGroup"></om:OMS>
       </om:OMA>
@@ -1271,10 +1271,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grp" name="CanEasilyTestMembership"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grp" name="CanEasilyTestMembership"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1289,10 +1289,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grp" name="CanComputeSizeAnySubgroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="grp" name="CanComputeSizeAnySubgroup"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1307,10 +1307,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grp" name="KnowsHowToDecompose"></om:OMS>
       </om:OMA>
@@ -1328,10 +1328,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="grp" name="KnowsHowToDecompose"></om:OMS>
       </om:OMA>
@@ -1349,16 +1349,16 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsMemberPcSeriesPermGroup"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="fitfree" name="CanComputeFittingFree"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?pcgsperm"></import><constant name="IsModuloPcgsPermGroupRep">
+     </constant><constant name="IsModuloPcgsPermGroupRep">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="filter"></om:OMS></om:OMOBJ></type>
        
@@ -1372,10 +1372,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsModuloPcgsPermGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsModuloPcgsPermGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1390,10 +1390,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsModuloPcgsPermGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsModuloPcgsPermGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1408,10 +1408,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsModuloPcgsPermGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsModuloPcgsPermGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgsDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsPcgsDefaultRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1426,10 +1426,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsModuloPcgsPermGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsModuloPcgsPermGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsFiniteOrdersPcgs"></om:OMS>
       </om:OMA>
@@ -1447,10 +1447,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsModuloPcgsPermGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsModuloPcgsPermGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pcgs" name="IsFiniteOrdersPcgs"></om:OMS>
       </om:OMA>
@@ -1468,10 +1468,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsModuloPcgsPermGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsModuloPcgsPermGroupRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsPcgsPermGroupRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pcgsperm" name="IsPcgsPermGroupRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/permutat.omdoc b/content/http..www.gap-system.org/lib/permutat.omdoc
index 5541c4a827a3144bc2152734052a63e4ecb487c7..70429a7ff977c5f5765ffea525b4ac1402cb7056 100644
--- a/content/http..www.gap-system.org/lib/permutat.omdoc
+++ b/content/http..www.gap-system.org/lib/permutat.omdoc
@@ -12,13 +12,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="permutat" name="IsPerm"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -36,13 +36,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="permutat" name="IsPerm"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -60,13 +60,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="permutat" name="IsPerm"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -84,13 +84,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="permutat" name="IsPerm"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -108,13 +108,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="permutat" name="IsPerm"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -132,13 +132,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="permutat" name="IsPerm"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -156,13 +156,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="permutat" name="IsPerm"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsFiniteOrderElement"></om:OMS>
       </om:OMA>
@@ -171,7 +171,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?permutat"></import><constant name="SmallestGeneratorPerm">
+     </constant><constant name="SmallestGeneratorPerm">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
@@ -193,10 +193,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="permutat" name="IsPerm4Rep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="permutat" name="IsPerm4Rep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsInternalRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsInternalRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -224,10 +224,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="permutat" name="IsPerm2Rep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="permutat" name="IsPerm2Rep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsInternalRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsInternalRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/pperm.omdoc b/content/http..www.gap-system.org/lib/pperm.omdoc
index d9fb08e54509ba3431497af66942820412fd00de..1e5e5ea50db7c9002168a01f91ccc649072262b8 100644
--- a/content/http..www.gap-system.org/lib/pperm.omdoc
+++ b/content/http..www.gap-system.org/lib/pperm.omdoc
@@ -12,13 +12,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pperm" name="IsPartialPerm"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -36,13 +36,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pperm" name="IsPartialPerm"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -60,13 +60,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pperm" name="IsPartialPerm"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -84,13 +84,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pperm" name="IsPartialPerm"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -108,13 +108,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pperm" name="IsPartialPerm"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -132,13 +132,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="pperm" name="IsPartialPerm"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -147,7 +147,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?pperm"></import><constant name="FixedPointsOfPartialPerm">
+     </constant><constant name="FixedPointsOfPartialPerm">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
@@ -169,10 +169,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pperm" name="IsPPerm2Rep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pperm" name="IsPPerm2Rep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsInternalRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsInternalRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -328,10 +328,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pperm" name="IsPPerm4Rep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="pperm" name="IsPPerm4Rep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsInternalRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsInternalRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/quotsys.omdoc b/content/http..www.gap-system.org/lib/quotsys.omdoc
index b59b9723f79cd7996274e8c237fe2cf71f10cf8b..6e09ba9a02120c77d0bff37e85aaf62b330d7122 100644
--- a/content/http..www.gap-system.org/lib/quotsys.omdoc
+++ b/content/http..www.gap-system.org/lib/quotsys.omdoc
@@ -3,7 +3,7 @@
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="category"></om:OMS></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?quotsys"></import><constant name="DefineNewGenerators">
+     </constant><constant name="DefineNewGenerators">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
diff --git a/content/http..www.gap-system.org/lib/random.omdoc b/content/http..www.gap-system.org/lib/random.omdoc
index e6f04e5ebfdd3edd2c002645540db87b85649de3..88ae857c4356d32372f835266df8ae7faddece06 100644
--- a/content/http..www.gap-system.org/lib/random.omdoc
+++ b/content/http..www.gap-system.org/lib/random.omdoc
@@ -12,19 +12,19 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="random" name="IsRandomSource"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?random"></import><constant name="IsGAPRandomSource">
+     </constant><constant name="IsGAPRandomSource">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="category"></om:OMS></om:OMOBJ></type>
        
@@ -38,13 +38,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="random" name="IsGAPRandomSource"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -59,13 +59,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="random" name="IsGAPRandomSource"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="random" name="IsRandomSource"></om:OMS>
       </om:OMA>
@@ -88,13 +88,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="random" name="IsGlobalRandomSource"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -109,13 +109,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="random" name="IsGlobalRandomSource"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="random" name="IsRandomSource"></om:OMS>
       </om:OMA>
@@ -154,13 +154,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="random" name="IsMersenneTwister"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -175,13 +175,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="random" name="IsMersenneTwister"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="random" name="IsRandomSource"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/ratfun.omdoc b/content/http..www.gap-system.org/lib/ratfun.omdoc
index 2da0a1964c3406fd9ad5cd9ff9b650277958cc7f..7e927e70df7feda6890f16f65ff8ed871759c005 100644
--- a/content/http..www.gap-system.org/lib/ratfun.omdoc
+++ b/content/http..www.gap-system.org/lib/ratfun.omdoc
@@ -12,13 +12,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -36,13 +36,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -60,13 +60,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -84,13 +84,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -108,13 +108,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -132,13 +132,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -156,13 +156,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -180,13 +180,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -204,13 +204,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -228,13 +228,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -252,13 +252,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZDFRE"></om:OMS>
       </om:OMA>
@@ -267,7 +267,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?ratfun"></import><constant name="IsRationalFunction">
+     </constant><constant name="IsRationalFunction">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="category"></om:OMS></om:OMOBJ></type>
        
@@ -281,13 +281,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -305,13 +305,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -329,13 +329,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -353,13 +353,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -377,13 +377,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -401,13 +401,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -425,13 +425,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -449,13 +449,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -473,13 +473,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -497,13 +497,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -521,13 +521,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZDFRE"></om:OMS>
       </om:OMA>
@@ -545,13 +545,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunction"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialFunction"></om:OMS>
       </om:OMA>
@@ -590,13 +590,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsUnivariatePolynomialsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -614,13 +614,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsUnivariatePolynomialsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -638,13 +638,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsUnivariatePolynomialsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -662,13 +662,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsUnivariatePolynomialsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -686,13 +686,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsUnivariatePolynomialsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -710,13 +710,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsUnivariatePolynomialsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -734,13 +734,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsUnivariatePolynomialsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -758,13 +758,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsUnivariatePolynomialsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -782,13 +782,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsUnivariatePolynomialsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -806,13 +806,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsUnivariatePolynomialsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -830,13 +830,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsUnivariatePolynomialsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZDFRE"></om:OMS>
       </om:OMA>
@@ -854,13 +854,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsUnivariatePolynomialsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialFunction"></om:OMS>
       </om:OMA>
@@ -878,13 +878,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsUnivariatePolynomialsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunction"></om:OMS>
       </om:OMA>
@@ -923,13 +923,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -947,13 +947,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -971,13 +971,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -995,13 +995,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -1019,13 +1019,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -1043,13 +1043,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -1067,13 +1067,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -1091,13 +1091,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -1115,13 +1115,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -1139,13 +1139,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -1163,13 +1163,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZDFRE"></om:OMS>
       </om:OMA>
@@ -1187,13 +1187,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialFunction"></om:OMS>
       </om:OMA>
@@ -1211,13 +1211,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunction"></om:OMS>
       </om:OMA>
@@ -1272,10 +1272,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1290,10 +1290,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1308,10 +1308,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -1329,10 +1329,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -1350,10 +1350,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -1371,10 +1371,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -1392,10 +1392,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -1413,10 +1413,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -1434,10 +1434,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -1455,10 +1455,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -1476,10 +1476,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -1497,10 +1497,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -1518,10 +1518,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZDFRE"></om:OMS>
       </om:OMA>
@@ -1539,10 +1539,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialFunction"></om:OMS>
       </om:OMA>
@@ -1560,10 +1560,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsUnivariateRationalFunction"></om:OMS>
       </om:OMA>
@@ -1581,10 +1581,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsUnivariateRationalFunction"></om:OMS>
       </om:OMA>
@@ -1602,10 +1602,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomial"></om:OMS>
       </om:OMA>
@@ -1623,10 +1623,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomial"></om:OMS>
       </om:OMA>
@@ -1665,13 +1665,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialFunctionsFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsFamily"></om:OMS>
       </om:OMA>
@@ -1694,13 +1694,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionsFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsFamily"></om:OMS>
       </om:OMA>
@@ -1718,13 +1718,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionsFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsUFDFamily"></om:OMS>
       </om:OMA>
@@ -1742,13 +1742,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionsFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsUFDFamily"></om:OMS>
       </om:OMA>
@@ -1766,13 +1766,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionsFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialFunctionsFamily"></om:OMS>
       </om:OMA>
@@ -1795,10 +1795,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1813,10 +1813,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1831,10 +1831,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -1852,10 +1852,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -1873,10 +1873,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -1894,10 +1894,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -1915,10 +1915,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -1936,10 +1936,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -1957,10 +1957,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -1978,10 +1978,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -1999,10 +1999,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -2020,10 +2020,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -2041,10 +2041,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZDFRE"></om:OMS>
       </om:OMA>
@@ -2062,10 +2062,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialFunction"></om:OMS>
       </om:OMA>
@@ -2083,10 +2083,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomial"></om:OMS>
       </om:OMA>
@@ -2104,10 +2104,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomial"></om:OMS>
       </om:OMA>
@@ -2154,13 +2154,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialsFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsFamily"></om:OMS>
       </om:OMA>
@@ -2178,13 +2178,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialsFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="OneImmutable"></om:OMS>
       </om:OMA>
@@ -2202,13 +2202,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialsFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsCommutativeFamily"></om:OMS>
       </om:OMA>
@@ -2226,13 +2226,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsLaurentPolynomialsFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsCommutativeFamily"></om:OMS>
       </om:OMA>
@@ -2255,13 +2255,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsUnivariatePolynomialsFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsFamily"></om:OMS>
       </om:OMA>
@@ -2284,10 +2284,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsUnivariateRationalFunctionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsUnivariateRationalFunctionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -2302,10 +2302,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsUnivariateRationalFunctionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsUnivariateRationalFunctionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -2320,10 +2320,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsUnivariateRationalFunctionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsUnivariateRationalFunctionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -2341,10 +2341,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsUnivariateRationalFunctionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsUnivariateRationalFunctionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -2362,10 +2362,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsUnivariateRationalFunctionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsUnivariateRationalFunctionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -2383,10 +2383,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsUnivariateRationalFunctionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsUnivariateRationalFunctionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -2404,10 +2404,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsUnivariateRationalFunctionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsUnivariateRationalFunctionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -2425,10 +2425,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsUnivariateRationalFunctionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsUnivariateRationalFunctionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -2446,10 +2446,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsUnivariateRationalFunctionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsUnivariateRationalFunctionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -2467,10 +2467,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsUnivariateRationalFunctionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsUnivariateRationalFunctionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -2488,10 +2488,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsUnivariateRationalFunctionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsUnivariateRationalFunctionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -2509,10 +2509,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsUnivariateRationalFunctionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsUnivariateRationalFunctionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -2530,10 +2530,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsUnivariateRationalFunctionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsUnivariateRationalFunctionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZDFRE"></om:OMS>
       </om:OMA>
@@ -2551,10 +2551,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsUnivariateRationalFunctionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsUnivariateRationalFunctionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialFunction"></om:OMS>
       </om:OMA>
@@ -2572,10 +2572,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsUnivariateRationalFunctionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsUnivariateRationalFunctionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsUnivariateRationalFunction"></om:OMS>
       </om:OMA>
@@ -2593,10 +2593,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsUnivariateRationalFunctionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsUnivariateRationalFunctionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsUnivariateRationalFunction"></om:OMS>
       </om:OMA>
@@ -2627,13 +2627,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialFunctionsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -2651,13 +2651,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialFunctionsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -2675,13 +2675,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialFunctionsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -2699,13 +2699,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialFunctionsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -2723,13 +2723,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialFunctionsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -2747,13 +2747,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialFunctionsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -2771,13 +2771,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialFunctionsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -2795,13 +2795,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialFunctionsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -2819,13 +2819,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialFunctionsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -2843,13 +2843,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialFunctionsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -2867,13 +2867,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialFunctionsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZDFRE"></om:OMS>
       </om:OMA>
@@ -2891,13 +2891,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialFunctionsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialFunction"></om:OMS>
       </om:OMA>
@@ -2980,13 +2980,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -3004,13 +3004,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -3028,13 +3028,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -3052,13 +3052,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -3076,13 +3076,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -3100,13 +3100,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -3124,13 +3124,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -3148,13 +3148,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -3172,13 +3172,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -3196,13 +3196,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -3220,13 +3220,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZDFRE"></om:OMS>
       </om:OMA>
@@ -3244,13 +3244,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialFunction"></om:OMS>
       </om:OMA>
@@ -3268,13 +3268,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunction"></om:OMS>
       </om:OMA>
@@ -3292,13 +3292,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionsFamilyElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialFunctionsFamilyElement"></om:OMS>
       </om:OMA>
@@ -3419,10 +3419,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -3437,10 +3437,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -3455,10 +3455,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -3476,10 +3476,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -3497,10 +3497,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -3518,10 +3518,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -3539,10 +3539,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -3560,10 +3560,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -3581,10 +3581,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -3602,10 +3602,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -3623,10 +3623,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -3644,10 +3644,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -3665,10 +3665,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZDFRE"></om:OMS>
       </om:OMA>
@@ -3686,10 +3686,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialFunction"></om:OMS>
       </om:OMA>
@@ -3707,10 +3707,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunction"></om:OMS>
       </om:OMA>
@@ -3757,13 +3757,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionOverField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -3781,13 +3781,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionOverField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -3805,13 +3805,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionOverField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -3829,13 +3829,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionOverField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -3853,13 +3853,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionOverField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -3877,13 +3877,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionOverField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -3901,13 +3901,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionOverField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -3925,13 +3925,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionOverField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -3949,13 +3949,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionOverField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -3973,13 +3973,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionOverField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -3997,13 +3997,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionOverField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZDFRE"></om:OMS>
       </om:OMA>
@@ -4021,13 +4021,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionOverField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsPolynomialFunction"></om:OMS>
       </om:OMA>
@@ -4045,13 +4045,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunctionOverField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ratfun" name="IsRationalFunction"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/rational.omdoc b/content/http..www.gap-system.org/lib/rational.omdoc
index e8a76e422f90fbc25046a854d41fdfe30099e435..60e9754e75bdafa98ad5514980a9d8660ce9c6f3 100644
--- a/content/http..www.gap-system.org/lib/rational.omdoc
+++ b/content/http..www.gap-system.org/lib/rational.omdoc
@@ -12,10 +12,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rational" name="IsCanonicalBasisRationals"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rational" name="IsCanonicalBasisRationals"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -30,10 +30,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rational" name="IsCanonicalBasisRationals"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rational" name="IsCanonicalBasisRationals"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/record.omdoc b/content/http..www.gap-system.org/lib/record.omdoc
index cc1fc5027e96382838142c62da4f09c3bdd6fbbe..371d41cac04aac7654874318b5ec4cfe9720d95f 100644
--- a/content/http..www.gap-system.org/lib/record.omdoc
+++ b/content/http..www.gap-system.org/lib/record.omdoc
@@ -3,7 +3,7 @@
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="category"></om:OMS></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?record"></import><constant name="RecNames">
+     </constant><constant name="RecNames">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
diff --git a/content/http..www.gap-system.org/lib/reesmat.omdoc b/content/http..www.gap-system.org/lib/reesmat.omdoc
index 9c7cd642c0e4dd89bbe790d1822d4fbe5fbf60a3..9b5b2f221c58ae0d3a6930c4876f929ea8532742 100644
--- a/content/http..www.gap-system.org/lib/reesmat.omdoc
+++ b/content/http..www.gap-system.org/lib/reesmat.omdoc
@@ -36,13 +36,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="reesmat" name="IsReesMatrixSemigroupElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -60,13 +60,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="reesmat" name="IsReesMatrixSemigroupElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -84,13 +84,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="reesmat" name="IsReesMatrixSemigroupElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -108,13 +108,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="reesmat" name="IsReesMatrixSemigroupElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -123,7 +123,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?reesmat"></import><constant name="GeneratorsOfReesMatrixSemigroup">
+     </constant><constant name="GeneratorsOfReesMatrixSemigroup">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
@@ -145,13 +145,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="reesmat" name="IsReesZeroMatrixSemigroupElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -169,13 +169,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="reesmat" name="IsReesZeroMatrixSemigroupElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -193,13 +193,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="reesmat" name="IsReesZeroMatrixSemigroupElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -217,13 +217,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="reesmat" name="IsReesZeroMatrixSemigroupElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/relation.omdoc b/content/http..www.gap-system.org/lib/relation.omdoc
index e37eab7d0b6a044c7d505271efeed30ca6322233..a2f99497406e4013b3dc84791ae61f30dd7befcb 100644
--- a/content/http..www.gap-system.org/lib/relation.omdoc
+++ b/content/http..www.gap-system.org/lib/relation.omdoc
@@ -60,13 +60,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsEquivalenceClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -84,13 +84,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsEquivalenceClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -108,13 +108,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsEquivalenceClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -132,13 +132,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsEquivalenceClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -156,13 +156,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsEquivalenceClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -171,7 +171,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?relation"></import><constant name="EquivalenceClassRelation">
+     </constant><constant name="EquivalenceClassRelation">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
@@ -201,10 +201,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsBinaryRelationDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsBinaryRelationDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -219,10 +219,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsBinaryRelationDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsBinaryRelationDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -290,10 +290,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsBinaryRelationOnPointsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsBinaryRelationOnPointsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -308,10 +308,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsBinaryRelationOnPointsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsBinaryRelationOnPointsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -403,10 +403,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsEquivalenceRelationDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsEquivalenceRelationDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -421,10 +421,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsEquivalenceRelationDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsEquivalenceRelationDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -444,10 +444,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsEquivalenceClassDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsEquivalenceClassDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -462,10 +462,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsEquivalenceClassDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsEquivalenceClassDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/ring.omdoc b/content/http..www.gap-system.org/lib/ring.omdoc
index 8cd745a23b0e11b6c41fc0934e9beb3ff1623577..f3907c87e2bbfbc02a60be6e469fd937b474f618 100644
--- a/content/http..www.gap-system.org/lib/ring.omdoc
+++ b/content/http..www.gap-system.org/lib/ring.omdoc
@@ -12,13 +12,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsUniqueFactorizationRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -36,13 +36,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsUniqueFactorizationRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -60,13 +60,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsUniqueFactorizationRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -84,13 +84,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsUniqueFactorizationRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -108,13 +108,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsUniqueFactorizationRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -132,13 +132,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsUniqueFactorizationRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -162,13 +162,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsUniqueFactorizationRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -192,13 +192,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsUniqueFactorizationRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -222,13 +222,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsUniqueFactorizationRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -252,13 +252,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsUniqueFactorizationRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -282,13 +282,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsUniqueFactorizationRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -306,13 +306,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsUniqueFactorizationRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -336,13 +336,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsUniqueFactorizationRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -360,13 +360,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsUniqueFactorizationRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -390,13 +390,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsUniqueFactorizationRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -420,13 +420,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsUniqueFactorizationRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -444,13 +444,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsUniqueFactorizationRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagma"></om:OMS>
       </om:OMA>
@@ -468,13 +468,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsUniqueFactorizationRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagma"></om:OMS>
       </om:OMA>
@@ -492,13 +492,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsUniqueFactorizationRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagmaWithZero"></om:OMS>
       </om:OMA>
@@ -516,13 +516,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsUniqueFactorizationRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveGroup"></om:OMS>
       </om:OMA>
@@ -540,13 +540,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsUniqueFactorizationRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -564,13 +564,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsUniqueFactorizationRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -588,13 +588,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsUniqueFactorizationRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsLDistributive"></om:OMS>
       </om:OMA>
@@ -612,13 +612,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsUniqueFactorizationRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsLDistributive"></om:OMS>
       </om:OMA>
@@ -636,13 +636,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsUniqueFactorizationRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsRDistributive"></om:OMS>
       </om:OMA>
@@ -660,13 +660,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsUniqueFactorizationRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsRDistributive"></om:OMS>
       </om:OMA>
@@ -675,7 +675,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?ring"></import><constant name="IsEuclideanRing">
+     </constant><constant name="IsEuclideanRing">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="category"></om:OMS></om:OMOBJ></type>
        
@@ -689,13 +689,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsEuclideanRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -713,13 +713,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsEuclideanRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -737,13 +737,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsEuclideanRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -761,13 +761,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsEuclideanRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -785,13 +785,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsEuclideanRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -809,13 +809,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsEuclideanRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -839,13 +839,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsEuclideanRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -869,13 +869,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsEuclideanRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -899,13 +899,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsEuclideanRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -929,13 +929,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsEuclideanRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -959,13 +959,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsEuclideanRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -983,13 +983,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsEuclideanRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1013,13 +1013,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsEuclideanRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -1037,13 +1037,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsEuclideanRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1067,13 +1067,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsEuclideanRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1097,13 +1097,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsEuclideanRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1127,13 +1127,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsEuclideanRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -1151,13 +1151,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsEuclideanRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagma"></om:OMS>
       </om:OMA>
@@ -1175,13 +1175,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsEuclideanRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagmaWithOne"></om:OMS>
       </om:OMA>
@@ -1199,13 +1199,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsEuclideanRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="MultiplicativeNeutralElement"></om:OMS>
       </om:OMA>
@@ -1223,13 +1223,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsEuclideanRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagma"></om:OMS>
       </om:OMA>
@@ -1247,13 +1247,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsEuclideanRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagmaWithZero"></om:OMS>
       </om:OMA>
@@ -1271,13 +1271,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsEuclideanRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveGroup"></om:OMS>
       </om:OMA>
@@ -1295,13 +1295,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsEuclideanRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -1319,13 +1319,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsEuclideanRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -1343,13 +1343,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsEuclideanRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsLDistributive"></om:OMS>
       </om:OMA>
@@ -1367,13 +1367,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsEuclideanRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsLDistributive"></om:OMS>
       </om:OMA>
@@ -1391,13 +1391,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsEuclideanRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsRDistributive"></om:OMS>
       </om:OMA>
@@ -1415,13 +1415,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsEuclideanRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsRDistributive"></om:OMS>
       </om:OMA>
@@ -1439,13 +1439,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsEuclideanRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ring" name="IsUniqueFactorizationRing"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/ringhom.omdoc b/content/http..www.gap-system.org/lib/ringhom.omdoc
index 2560f1e45b9058f4824cfa9851a80d818775c32c..688bb50ba4ab09b0afa2528a7ce2bc589d47e70e 100644
--- a/content/http..www.gap-system.org/lib/ringhom.omdoc
+++ b/content/http..www.gap-system.org/lib/ringhom.omdoc
@@ -12,10 +12,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsRingGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsRingGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -30,10 +30,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsRingGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsRingGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -48,10 +48,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsRingGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsRingGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -69,10 +69,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsRingGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsRingGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -90,10 +90,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsRingGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsRingGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -111,10 +111,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsRingGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsRingGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -132,10 +132,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsRingGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsRingGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -153,10 +153,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsRingGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsRingGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -174,10 +174,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsRingGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsRingGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -195,10 +195,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsRingGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsRingGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -216,10 +216,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsRingGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsRingGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -237,10 +237,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsRingGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsRingGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -258,10 +258,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsRingGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsRingGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -279,10 +279,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsRingGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsRingGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -300,10 +300,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsRingGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsRingGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -321,10 +321,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsRingGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsRingGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -342,10 +342,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsRingGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsRingGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsAddition"></om:OMS>
       </om:OMA>
@@ -363,10 +363,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsRingGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsRingGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsAddition"></om:OMS>
       </om:OMA>
@@ -384,10 +384,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsRingGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsRingGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsZero"></om:OMS>
       </om:OMA>
@@ -405,10 +405,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsRingGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsRingGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsZero"></om:OMS>
       </om:OMA>
@@ -426,10 +426,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsRingGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsRingGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsAdditiveInverses"></om:OMS>
       </om:OMA>
@@ -447,10 +447,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsRingGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsRingGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsAdditiveInverses"></om:OMS>
       </om:OMA>
@@ -467,7 +467,7 @@
       </om:OMA></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?ringhom"></import><constant name="IsSCRingGeneralMappingByImagesDefaultRep">
+     </constant><constant name="IsSCRingGeneralMappingByImagesDefaultRep">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="filter"></om:OMS></om:OMOBJ></type>
        
@@ -481,10 +481,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsSCRingGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsSCRingGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -499,10 +499,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsSCRingGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsSCRingGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -517,10 +517,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsSCRingGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsSCRingGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -538,10 +538,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsSCRingGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsSCRingGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -559,10 +559,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsSCRingGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsSCRingGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -580,10 +580,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsSCRingGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsSCRingGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -601,10 +601,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsSCRingGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsSCRingGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -622,10 +622,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsSCRingGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsSCRingGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -643,10 +643,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsSCRingGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsSCRingGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -664,10 +664,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsSCRingGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsSCRingGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -685,10 +685,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsSCRingGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsSCRingGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -706,10 +706,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsSCRingGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsSCRingGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -727,10 +727,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsSCRingGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsSCRingGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -748,10 +748,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsSCRingGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsSCRingGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -769,10 +769,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsSCRingGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsSCRingGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -790,10 +790,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsSCRingGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsSCRingGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -811,10 +811,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsSCRingGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsSCRingGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsAddition"></om:OMS>
       </om:OMA>
@@ -832,10 +832,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsSCRingGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsSCRingGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsAddition"></om:OMS>
       </om:OMA>
@@ -853,10 +853,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsSCRingGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsSCRingGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsZero"></om:OMS>
       </om:OMA>
@@ -874,10 +874,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsSCRingGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsSCRingGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsZero"></om:OMS>
       </om:OMA>
@@ -895,10 +895,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsSCRingGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsSCRingGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsAdditiveInverses"></om:OMS>
       </om:OMA>
@@ -916,10 +916,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsSCRingGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsSCRingGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsAdditiveInverses"></om:OMS>
       </om:OMA>
@@ -937,10 +937,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsSCRingGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsSCRingGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsRingGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="ringhom" name="IsRingGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/ringpoly.omdoc b/content/http..www.gap-system.org/lib/ringpoly.omdoc
index 4a25a749f7e6b2609693813d84506a055c1b2968..3e9d3088c0338042d555642f2ed6ac470a73a9c3 100644
--- a/content/http..www.gap-system.org/lib/ringpoly.omdoc
+++ b/content/http..www.gap-system.org/lib/ringpoly.omdoc
@@ -20,13 +20,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -44,13 +44,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -68,13 +68,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -92,13 +92,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -116,13 +116,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -140,13 +140,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -170,13 +170,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -200,13 +200,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -230,13 +230,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -260,13 +260,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -290,13 +290,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -314,13 +314,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -344,13 +344,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -368,13 +368,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -398,13 +398,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -428,13 +428,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -452,13 +452,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagma"></om:OMS>
       </om:OMA>
@@ -476,13 +476,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagma"></om:OMS>
       </om:OMA>
@@ -500,13 +500,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagmaWithZero"></om:OMS>
       </om:OMA>
@@ -524,13 +524,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveGroup"></om:OMS>
       </om:OMA>
@@ -548,13 +548,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -572,13 +572,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -596,13 +596,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsLDistributive"></om:OMS>
       </om:OMA>
@@ -620,13 +620,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsLDistributive"></om:OMS>
       </om:OMA>
@@ -644,13 +644,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsRDistributive"></om:OMS>
       </om:OMA>
@@ -668,13 +668,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsRDistributive"></om:OMS>
       </om:OMA>
@@ -683,7 +683,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?ringpoly"></import><constant name="IsAlgebraicExtensionPolynomialRing">
+     </constant><constant name="IsAlgebraicExtensionPolynomialRing">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="category"></om:OMS></om:OMOBJ></type>
        
@@ -697,13 +697,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAlgebraicExtensionPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -721,13 +721,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAlgebraicExtensionPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -745,13 +745,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAlgebraicExtensionPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -769,13 +769,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAlgebraicExtensionPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -793,13 +793,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAlgebraicExtensionPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -817,13 +817,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAlgebraicExtensionPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -847,13 +847,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAlgebraicExtensionPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -877,13 +877,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAlgebraicExtensionPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -907,13 +907,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAlgebraicExtensionPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -937,13 +937,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAlgebraicExtensionPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -967,13 +967,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAlgebraicExtensionPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -991,13 +991,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAlgebraicExtensionPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1021,13 +1021,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAlgebraicExtensionPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -1045,13 +1045,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAlgebraicExtensionPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1075,13 +1075,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAlgebraicExtensionPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1105,13 +1105,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAlgebraicExtensionPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -1129,13 +1129,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAlgebraicExtensionPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagma"></om:OMS>
       </om:OMA>
@@ -1153,13 +1153,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAlgebraicExtensionPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagma"></om:OMS>
       </om:OMA>
@@ -1177,13 +1177,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAlgebraicExtensionPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagmaWithZero"></om:OMS>
       </om:OMA>
@@ -1201,13 +1201,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAlgebraicExtensionPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveGroup"></om:OMS>
       </om:OMA>
@@ -1225,13 +1225,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAlgebraicExtensionPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -1249,13 +1249,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAlgebraicExtensionPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -1273,13 +1273,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAlgebraicExtensionPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsLDistributive"></om:OMS>
       </om:OMA>
@@ -1297,13 +1297,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAlgebraicExtensionPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsLDistributive"></om:OMS>
       </om:OMA>
@@ -1321,13 +1321,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAlgebraicExtensionPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsRDistributive"></om:OMS>
       </om:OMA>
@@ -1345,13 +1345,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAlgebraicExtensionPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsRDistributive"></om:OMS>
       </om:OMA>
@@ -1369,13 +1369,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAlgebraicExtensionPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsPolynomialRing"></om:OMS>
       </om:OMA>
@@ -1398,13 +1398,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFunctionField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -1422,13 +1422,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFunctionField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -1446,13 +1446,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFunctionField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1470,13 +1470,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFunctionField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1494,13 +1494,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFunctionField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -1518,13 +1518,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFunctionField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1548,13 +1548,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFunctionField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1578,13 +1578,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFunctionField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1608,13 +1608,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFunctionField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1638,13 +1638,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFunctionField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1668,13 +1668,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFunctionField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -1692,13 +1692,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFunctionField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1722,13 +1722,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFunctionField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -1746,13 +1746,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFunctionField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1776,13 +1776,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFunctionField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1806,13 +1806,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFunctionField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -1830,13 +1830,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFunctionField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagma"></om:OMS>
       </om:OMA>
@@ -1854,13 +1854,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFunctionField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagma"></om:OMS>
       </om:OMA>
@@ -1878,13 +1878,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFunctionField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagmaWithZero"></om:OMS>
       </om:OMA>
@@ -1902,13 +1902,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFunctionField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveGroup"></om:OMS>
       </om:OMA>
@@ -1926,13 +1926,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFunctionField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -1950,13 +1950,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFunctionField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -1974,13 +1974,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFunctionField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsLDistributive"></om:OMS>
       </om:OMA>
@@ -1998,13 +1998,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFunctionField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsLDistributive"></om:OMS>
       </om:OMA>
@@ -2022,13 +2022,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFunctionField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsRDistributive"></om:OMS>
       </om:OMA>
@@ -2046,13 +2046,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFunctionField"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsRDistributive"></om:OMS>
       </om:OMA>
@@ -2075,13 +2075,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFiniteFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -2099,13 +2099,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFiniteFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -2123,13 +2123,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFiniteFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -2147,13 +2147,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFiniteFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -2171,13 +2171,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFiniteFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -2195,13 +2195,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFiniteFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2225,13 +2225,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFiniteFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2255,13 +2255,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFiniteFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2285,13 +2285,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFiniteFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2315,13 +2315,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFiniteFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2345,13 +2345,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFiniteFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -2369,13 +2369,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFiniteFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2399,13 +2399,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFiniteFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -2423,13 +2423,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFiniteFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2453,13 +2453,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFiniteFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2483,13 +2483,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFiniteFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -2507,13 +2507,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFiniteFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagma"></om:OMS>
       </om:OMA>
@@ -2531,13 +2531,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFiniteFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagma"></om:OMS>
       </om:OMA>
@@ -2555,13 +2555,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFiniteFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagmaWithZero"></om:OMS>
       </om:OMA>
@@ -2579,13 +2579,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFiniteFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveGroup"></om:OMS>
       </om:OMA>
@@ -2603,13 +2603,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFiniteFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -2627,13 +2627,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFiniteFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -2651,13 +2651,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFiniteFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsLDistributive"></om:OMS>
       </om:OMA>
@@ -2675,13 +2675,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFiniteFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsLDistributive"></om:OMS>
       </om:OMA>
@@ -2699,13 +2699,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFiniteFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsRDistributive"></om:OMS>
       </om:OMA>
@@ -2723,13 +2723,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFiniteFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsRDistributive"></om:OMS>
       </om:OMA>
@@ -2747,13 +2747,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsFiniteFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsPolynomialRing"></om:OMS>
       </om:OMA>
@@ -2776,13 +2776,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsUnivariatePolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -2800,13 +2800,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsUnivariatePolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -2824,13 +2824,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsUnivariatePolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -2848,13 +2848,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsUnivariatePolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -2872,13 +2872,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsUnivariatePolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -2896,13 +2896,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsUnivariatePolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2926,13 +2926,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsUnivariatePolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2956,13 +2956,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsUnivariatePolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2986,13 +2986,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsUnivariatePolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -3016,13 +3016,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsUnivariatePolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -3046,13 +3046,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsUnivariatePolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -3070,13 +3070,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsUnivariatePolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -3100,13 +3100,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsUnivariatePolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -3124,13 +3124,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsUnivariatePolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -3154,13 +3154,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsUnivariatePolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -3184,13 +3184,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsUnivariatePolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -3208,13 +3208,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsUnivariatePolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagma"></om:OMS>
       </om:OMA>
@@ -3232,13 +3232,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsUnivariatePolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagma"></om:OMS>
       </om:OMA>
@@ -3256,13 +3256,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsUnivariatePolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagmaWithZero"></om:OMS>
       </om:OMA>
@@ -3280,13 +3280,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsUnivariatePolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveGroup"></om:OMS>
       </om:OMA>
@@ -3304,13 +3304,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsUnivariatePolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -3328,13 +3328,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsUnivariatePolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -3352,13 +3352,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsUnivariatePolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsLDistributive"></om:OMS>
       </om:OMA>
@@ -3376,13 +3376,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsUnivariatePolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsLDistributive"></om:OMS>
       </om:OMA>
@@ -3400,13 +3400,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsUnivariatePolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsRDistributive"></om:OMS>
       </om:OMA>
@@ -3424,13 +3424,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsUnivariatePolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsRDistributive"></om:OMS>
       </om:OMA>
@@ -3448,13 +3448,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsUnivariatePolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsPolynomialRing"></om:OMS>
       </om:OMA>
@@ -3485,13 +3485,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAbelianNumberFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -3509,13 +3509,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAbelianNumberFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -3533,13 +3533,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAbelianNumberFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -3557,13 +3557,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAbelianNumberFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -3581,13 +3581,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAbelianNumberFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -3605,13 +3605,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAbelianNumberFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -3635,13 +3635,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAbelianNumberFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -3665,13 +3665,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAbelianNumberFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -3695,13 +3695,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAbelianNumberFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -3725,13 +3725,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAbelianNumberFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -3755,13 +3755,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAbelianNumberFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -3779,13 +3779,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAbelianNumberFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -3809,13 +3809,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAbelianNumberFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -3833,13 +3833,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAbelianNumberFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -3863,13 +3863,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAbelianNumberFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -3893,13 +3893,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAbelianNumberFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -3917,13 +3917,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAbelianNumberFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagma"></om:OMS>
       </om:OMA>
@@ -3941,13 +3941,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAbelianNumberFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagma"></om:OMS>
       </om:OMA>
@@ -3965,13 +3965,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAbelianNumberFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagmaWithZero"></om:OMS>
       </om:OMA>
@@ -3989,13 +3989,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAbelianNumberFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveGroup"></om:OMS>
       </om:OMA>
@@ -4013,13 +4013,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAbelianNumberFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -4037,13 +4037,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAbelianNumberFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -4061,13 +4061,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAbelianNumberFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsLDistributive"></om:OMS>
       </om:OMA>
@@ -4085,13 +4085,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAbelianNumberFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsLDistributive"></om:OMS>
       </om:OMA>
@@ -4109,13 +4109,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAbelianNumberFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsRDistributive"></om:OMS>
       </om:OMA>
@@ -4133,13 +4133,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAbelianNumberFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsRDistributive"></om:OMS>
       </om:OMA>
@@ -4157,13 +4157,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAbelianNumberFieldPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsPolynomialRing"></om:OMS>
       </om:OMA>
@@ -4186,13 +4186,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsRationalsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -4210,13 +4210,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsRationalsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -4234,13 +4234,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsRationalsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -4258,13 +4258,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsRationalsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -4282,13 +4282,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsRationalsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -4306,13 +4306,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsRationalsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -4336,13 +4336,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsRationalsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -4366,13 +4366,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsRationalsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -4396,13 +4396,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsRationalsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -4426,13 +4426,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsRationalsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -4456,13 +4456,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsRationalsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -4480,13 +4480,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsRationalsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -4510,13 +4510,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsRationalsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -4534,13 +4534,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsRationalsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -4564,13 +4564,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsRationalsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -4594,13 +4594,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsRationalsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -4618,13 +4618,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsRationalsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagma"></om:OMS>
       </om:OMA>
@@ -4642,13 +4642,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsRationalsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagma"></om:OMS>
       </om:OMA>
@@ -4666,13 +4666,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsRationalsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagmaWithZero"></om:OMS>
       </om:OMA>
@@ -4690,13 +4690,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsRationalsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveGroup"></om:OMS>
       </om:OMA>
@@ -4714,13 +4714,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsRationalsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -4738,13 +4738,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsRationalsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -4762,13 +4762,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsRationalsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsLDistributive"></om:OMS>
       </om:OMA>
@@ -4786,13 +4786,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsRationalsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsLDistributive"></om:OMS>
       </om:OMA>
@@ -4810,13 +4810,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsRationalsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsRDistributive"></om:OMS>
       </om:OMA>
@@ -4834,13 +4834,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsRationalsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiring" name="IsRDistributive"></om:OMS>
       </om:OMA>
@@ -4858,13 +4858,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsRationalsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsPolynomialRing"></om:OMS>
       </om:OMA>
@@ -4882,13 +4882,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsRationalsPolynomialRing"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringpoly" name="IsAbelianNumberFieldPolynomialRing"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/ringsc.omdoc b/content/http..www.gap-system.org/lib/ringsc.omdoc
index c17c47dec823b5c0e1b57fc6ed19a2efa3bff048..60a639df2f9d9573fc08602221a4b8de3f192f03 100644
--- a/content/http..www.gap-system.org/lib/ringsc.omdoc
+++ b/content/http..www.gap-system.org/lib/ringsc.omdoc
@@ -28,13 +28,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringsc" name="IsSCRingObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -52,13 +52,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringsc" name="IsSCRingObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -76,13 +76,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringsc" name="IsSCRingObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -100,13 +100,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringsc" name="IsSCRingObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -124,13 +124,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringsc" name="IsSCRingObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -148,13 +148,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringsc" name="IsSCRingObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -172,13 +172,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringsc" name="IsSCRingObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -196,13 +196,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringsc" name="IsSCRingObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -220,13 +220,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringsc" name="IsSCRingObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -244,13 +244,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="ringsc" name="IsSCRingObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -259,7 +259,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?ringsc"></import><constant name="StandardGeneratorsSubringSCRing">
+     </constant><constant name="StandardGeneratorsSubringSCRing">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
diff --git a/content/http..www.gap-system.org/lib/rvecempt.omdoc b/content/http..www.gap-system.org/lib/rvecempt.omdoc
index c980161167180a7f4967e803c1e0c2659bcc3345..247d283499b684dbbdeaa6fd98ef987a40e0ae76 100644
--- a/content/http..www.gap-system.org/lib/rvecempt.omdoc
+++ b/content/http..www.gap-system.org/lib/rvecempt.omdoc
@@ -12,10 +12,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rvecempt" name="IsEmptyRowVectorRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rvecempt" name="IsEmptyRowVectorRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsList"></om:OMS>
       </om:OMA>
@@ -33,10 +33,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rvecempt" name="IsEmptyRowVectorRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rvecempt" name="IsEmptyRowVectorRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -51,10 +51,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rvecempt" name="IsEmptyRowVectorRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rvecempt" name="IsEmptyRowVectorRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -72,10 +72,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rvecempt" name="IsEmptyRowVectorRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rvecempt" name="IsEmptyRowVectorRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsConstantTimeAccessList"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/rws.omdoc b/content/http..www.gap-system.org/lib/rws.omdoc
index 0316510394aab968778d42a6643035c883c6a35e..f481ad2243e72e1182be4cbfb076e590f4165a14 100644
--- a/content/http..www.gap-system.org/lib/rws.omdoc
+++ b/content/http..www.gap-system.org/lib/rws.omdoc
@@ -12,13 +12,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rws" name="IsRewritingSystem"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="object" name="IsCopyable"></om:OMS>
       </om:OMA>
@@ -27,7 +27,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?rws"></import><constant name="NumberGeneratorsOfRws">
+     </constant><constant name="NumberGeneratorsOfRws">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
@@ -113,13 +113,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rws" name="IsReducedConfluentRewritingSystem"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="object" name="IsCopyable"></om:OMS>
       </om:OMA>
@@ -137,13 +137,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rws" name="IsReducedConfluentRewritingSystem"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rws" name="IsRewritingSystem"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/rwsdt.omdoc b/content/http..www.gap-system.org/lib/rwsdt.omdoc
index 44eaf065d53247a19597f0ba5bc713dd1d5e12c1..50e2750a0d86c8af484b1ab73f148b5809a80e23 100644
--- a/content/http..www.gap-system.org/lib/rwsdt.omdoc
+++ b/content/http..www.gap-system.org/lib/rwsdt.omdoc
@@ -12,10 +12,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwsdt" name="IsDeepThoughtCollectorRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwsdt" name="IsDeepThoughtCollectorRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/rwsgrp.omdoc b/content/http..www.gap-system.org/lib/rwsgrp.omdoc
index 5766dd99741327430119c2310cfe5efa3e7660e6..03549ee3f7b7a705d7c9761e4eaf49a4621fb431 100644
--- a/content/http..www.gap-system.org/lib/rwsgrp.omdoc
+++ b/content/http..www.gap-system.org/lib/rwsgrp.omdoc
@@ -12,13 +12,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwsgrp" name="IsMultiplicativeElementWithInverseByRws"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -36,13 +36,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwsgrp" name="IsMultiplicativeElementWithInverseByRws"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -60,13 +60,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwsgrp" name="IsMultiplicativeElementWithInverseByRws"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -84,13 +84,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwsgrp" name="IsMultiplicativeElementWithInverseByRws"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -108,13 +108,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwsgrp" name="IsMultiplicativeElementWithInverseByRws"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -145,13 +145,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwsgrp" name="IsElementsFamilyByRws"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsFamily"></om:OMS>
       </om:OMA>
@@ -168,7 +168,7 @@
       </om:OMA></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?rwsgrp"></import><constant name="ElementByRws">
+     </constant><constant name="ElementByRws">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
diff --git a/content/http..www.gap-system.org/lib/rwspcclt.omdoc b/content/http..www.gap-system.org/lib/rwspcclt.omdoc
index 94c76b16d7568bf18ef51c9ebf0fe59790c11d9d..013bb609cb733db5ca5b278890efd03cae9ab821 100644
--- a/content/http..www.gap-system.org/lib/rwspcclt.omdoc
+++ b/content/http..www.gap-system.org/lib/rwspcclt.omdoc
@@ -12,13 +12,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcclt" name="IsPolycyclicCollector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="object" name="IsCopyable"></om:OMS>
       </om:OMA>
@@ -36,13 +36,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcclt" name="IsPolycyclicCollector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rws" name="IsRewritingSystem"></om:OMS>
       </om:OMA>
@@ -60,13 +60,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcclt" name="IsPolycyclicCollector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rws" name="IsBuiltFromMagma"></om:OMS>
       </om:OMA>
@@ -84,13 +84,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcclt" name="IsPolycyclicCollector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rws" name="IsBuiltFromMagma"></om:OMS>
       </om:OMA>
@@ -108,13 +108,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcclt" name="IsPolycyclicCollector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rws" name="IsBuiltFromMagmaWithOne"></om:OMS>
       </om:OMA>
@@ -132,13 +132,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcclt" name="IsPolycyclicCollector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rws" name="IsBuiltFromMagmaWithOne"></om:OMS>
       </om:OMA>
@@ -156,13 +156,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcclt" name="IsPolycyclicCollector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rws" name="IsBuiltFromMagmaWithInverses"></om:OMS>
       </om:OMA>
@@ -180,13 +180,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcclt" name="IsPolycyclicCollector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rws" name="IsBuiltFromMagmaWithInverses"></om:OMS>
       </om:OMA>
@@ -204,13 +204,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcclt" name="IsPolycyclicCollector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rws" name="IsBuiltFromGroup"></om:OMS>
       </om:OMA>
@@ -228,13 +228,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcclt" name="IsPolycyclicCollector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rws" name="IsBuiltFromGroup"></om:OMS>
       </om:OMA>
@@ -243,7 +243,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?rwspcclt"></import><constant name="UpdatePolycyclicCollector">
+     </constant><constant name="UpdatePolycyclicCollector">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
@@ -297,13 +297,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcclt" name="IsPowerConjugateCollector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="object" name="IsCopyable"></om:OMS>
       </om:OMA>
@@ -321,13 +321,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcclt" name="IsPowerConjugateCollector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rws" name="IsRewritingSystem"></om:OMS>
       </om:OMA>
@@ -345,13 +345,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcclt" name="IsPowerConjugateCollector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rws" name="IsBuiltFromMagma"></om:OMS>
       </om:OMA>
@@ -369,13 +369,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcclt" name="IsPowerConjugateCollector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rws" name="IsBuiltFromMagma"></om:OMS>
       </om:OMA>
@@ -393,13 +393,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcclt" name="IsPowerConjugateCollector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rws" name="IsBuiltFromMagmaWithOne"></om:OMS>
       </om:OMA>
@@ -417,13 +417,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcclt" name="IsPowerConjugateCollector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rws" name="IsBuiltFromMagmaWithOne"></om:OMS>
       </om:OMA>
@@ -441,13 +441,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcclt" name="IsPowerConjugateCollector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rws" name="IsBuiltFromMagmaWithInverses"></om:OMS>
       </om:OMA>
@@ -465,13 +465,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcclt" name="IsPowerConjugateCollector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rws" name="IsBuiltFromMagmaWithInverses"></om:OMS>
       </om:OMA>
@@ -489,13 +489,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcclt" name="IsPowerConjugateCollector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rws" name="IsBuiltFromGroup"></om:OMS>
       </om:OMA>
@@ -513,13 +513,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcclt" name="IsPowerConjugateCollector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rws" name="IsBuiltFromGroup"></om:OMS>
       </om:OMA>
@@ -537,13 +537,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcclt" name="IsPowerConjugateCollector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcclt" name="IsPolycyclicCollector"></om:OMS>
       </om:OMA>
@@ -614,13 +614,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcclt" name="IsPowerCommutatorCollector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="object" name="IsCopyable"></om:OMS>
       </om:OMA>
@@ -638,13 +638,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcclt" name="IsPowerCommutatorCollector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rws" name="IsRewritingSystem"></om:OMS>
       </om:OMA>
@@ -662,13 +662,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcclt" name="IsPowerCommutatorCollector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rws" name="IsBuiltFromMagma"></om:OMS>
       </om:OMA>
@@ -686,13 +686,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcclt" name="IsPowerCommutatorCollector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rws" name="IsBuiltFromMagma"></om:OMS>
       </om:OMA>
@@ -710,13 +710,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcclt" name="IsPowerCommutatorCollector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rws" name="IsBuiltFromMagmaWithOne"></om:OMS>
       </om:OMA>
@@ -734,13 +734,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcclt" name="IsPowerCommutatorCollector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rws" name="IsBuiltFromMagmaWithOne"></om:OMS>
       </om:OMA>
@@ -758,13 +758,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcclt" name="IsPowerCommutatorCollector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rws" name="IsBuiltFromMagmaWithInverses"></om:OMS>
       </om:OMA>
@@ -782,13 +782,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcclt" name="IsPowerCommutatorCollector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rws" name="IsBuiltFromMagmaWithInverses"></om:OMS>
       </om:OMA>
@@ -806,13 +806,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcclt" name="IsPowerCommutatorCollector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rws" name="IsBuiltFromGroup"></om:OMS>
       </om:OMA>
@@ -830,13 +830,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcclt" name="IsPowerCommutatorCollector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rws" name="IsBuiltFromGroup"></om:OMS>
       </om:OMA>
@@ -854,13 +854,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcclt" name="IsPowerCommutatorCollector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcclt" name="IsPolycyclicCollector"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/rwspccoc.omdoc b/content/http..www.gap-system.org/lib/rwspccoc.omdoc
index 7e2097f4cda5a06ed6c6577978bfa716aad553e7..08d1c805208695dde69da71fd38564ad929e789b 100644
--- a/content/http..www.gap-system.org/lib/rwspccoc.omdoc
+++ b/content/http..www.gap-system.org/lib/rwspccoc.omdoc
@@ -12,10 +12,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspccoc" name="IsCombinatorialCollectorRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspccoc" name="IsCombinatorialCollectorRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -30,10 +30,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspccoc" name="IsCombinatorialCollectorRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspccoc" name="IsCombinatorialCollectorRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcsng" name="IsSingleCollectorRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcsng" name="IsSingleCollectorRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/rwspcgrp.omdoc b/content/http..www.gap-system.org/lib/rwspcgrp.omdoc
index 9b28bfc80411a7966d6d838a40a205bd8232efa3..1bb76f6a009c77f88b99acd14c8385df2df3d4a8 100644
--- a/content/http..www.gap-system.org/lib/rwspcgrp.omdoc
+++ b/content/http..www.gap-system.org/lib/rwspcgrp.omdoc
@@ -12,10 +12,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcgrp" name="IsNBitsPcWordRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcgrp" name="IsNBitsPcWordRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsDataObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsDataObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -56,13 +56,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcgrp" name="IsMultiplicativeElementWithInverseByPolycyclicCollector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -80,13 +80,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcgrp" name="IsMultiplicativeElementWithInverseByPolycyclicCollector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -104,13 +104,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcgrp" name="IsMultiplicativeElementWithInverseByPolycyclicCollector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -128,13 +128,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcgrp" name="IsMultiplicativeElementWithInverseByPolycyclicCollector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -152,13 +152,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcgrp" name="IsMultiplicativeElementWithInverseByPolycyclicCollector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -176,13 +176,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcgrp" name="IsMultiplicativeElementWithInverseByPolycyclicCollector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -200,13 +200,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcgrp" name="IsMultiplicativeElementWithInverseByPolycyclicCollector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwsgrp" name="IsMultiplicativeElementWithInverseByRws"></om:OMS>
       </om:OMA>
@@ -237,13 +237,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcgrp" name="IsElementsFamilyBy8BitsSingleCollector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsFamily"></om:OMS>
       </om:OMA>
@@ -261,13 +261,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcgrp" name="IsElementsFamilyBy8BitsSingleCollector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwsgrp" name="IsElementsFamilyByRws"></om:OMS>
       </om:OMA>
@@ -276,7 +276,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?rwspcgrp"></import><constant name="Is32BitsPcWordRep">
+     </constant><constant name="Is32BitsPcWordRep">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="filter"></om:OMS></om:OMOBJ></type>
        
@@ -290,10 +290,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcgrp" name="Is32BitsPcWordRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcgrp" name="Is32BitsPcWordRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsDataObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsDataObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -308,10 +308,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcgrp" name="Is32BitsPcWordRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcgrp" name="Is32BitsPcWordRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcgrp" name="IsKernelPcWord"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcgrp" name="IsKernelPcWord"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -326,10 +326,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcgrp" name="Is32BitsPcWordRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcgrp" name="Is32BitsPcWordRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcgrp" name="IsNBitsPcWordRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcgrp" name="IsNBitsPcWordRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -349,13 +349,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcgrp" name="IsElementFinitePolycyclicGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -373,13 +373,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcgrp" name="IsElementFinitePolycyclicGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -397,13 +397,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcgrp" name="IsElementFinitePolycyclicGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -421,13 +421,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcgrp" name="IsElementFinitePolycyclicGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -445,13 +445,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcgrp" name="IsElementFinitePolycyclicGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -469,13 +469,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcgrp" name="IsElementFinitePolycyclicGroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -538,10 +538,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcgrp" name="Is16BitsPcWordRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcgrp" name="Is16BitsPcWordRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsDataObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsDataObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -556,10 +556,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcgrp" name="Is16BitsPcWordRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcgrp" name="Is16BitsPcWordRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcgrp" name="IsKernelPcWord"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcgrp" name="IsKernelPcWord"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -574,10 +574,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcgrp" name="Is16BitsPcWordRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcgrp" name="Is16BitsPcWordRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcgrp" name="IsNBitsPcWordRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcgrp" name="IsNBitsPcWordRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -597,13 +597,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcgrp" name="IsElementsFamilyBy32BitsSingleCollector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsFamily"></om:OMS>
       </om:OMA>
@@ -621,13 +621,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcgrp" name="IsElementsFamilyBy32BitsSingleCollector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwsgrp" name="IsElementsFamilyByRws"></om:OMS>
       </om:OMA>
@@ -658,13 +658,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcgrp" name="IsElementsFamilyBy16BitsSingleCollector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsFamily"></om:OMS>
       </om:OMA>
@@ -682,13 +682,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwspcgrp" name="IsElementsFamilyBy16BitsSingleCollector"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="rwsgrp" name="IsElementsFamilyByRws"></om:OMS>
       </om:OMA>
@@ -711,10 +711,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcgrp" name="Is8BitsPcWordRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcgrp" name="Is8BitsPcWordRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsDataObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsDataObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -729,10 +729,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcgrp" name="Is8BitsPcWordRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcgrp" name="Is8BitsPcWordRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcgrp" name="IsKernelPcWord"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcgrp" name="IsKernelPcWord"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -747,10 +747,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcgrp" name="Is8BitsPcWordRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcgrp" name="Is8BitsPcWordRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcgrp" name="IsNBitsPcWordRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcgrp" name="IsNBitsPcWordRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/rwspcsng.omdoc b/content/http..www.gap-system.org/lib/rwspcsng.omdoc
index 6191786f82392e472b66182a9b9c5d4bf8367abd..d7d37af2400097a6c618e1cde89f3c04a2b494e4 100644
--- a/content/http..www.gap-system.org/lib/rwspcsng.omdoc
+++ b/content/http..www.gap-system.org/lib/rwspcsng.omdoc
@@ -12,16 +12,16 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcsng" name="IsSingleCollectorRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcsng" name="IsSingleCollectorRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?rwspcsng"></import><constant name="Is8BitsSingleCollectorRep">
+     </constant><constant name="Is8BitsSingleCollectorRep">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="filter"></om:OMS></om:OMOBJ></type>
        
@@ -35,10 +35,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcsng" name="Is8BitsSingleCollectorRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcsng" name="Is8BitsSingleCollectorRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -53,10 +53,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcsng" name="Is8BitsSingleCollectorRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcsng" name="Is8BitsSingleCollectorRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcsng" name="IsSingleCollectorRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcsng" name="IsSingleCollectorRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -76,10 +76,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcsng" name="Is32BitsSingleCollectorRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcsng" name="Is32BitsSingleCollectorRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -94,10 +94,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcsng" name="Is32BitsSingleCollectorRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcsng" name="Is32BitsSingleCollectorRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcsng" name="IsSingleCollectorRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcsng" name="IsSingleCollectorRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -122,10 +122,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcsng" name="Is16BitsSingleCollectorRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcsng" name="Is16BitsSingleCollectorRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -140,10 +140,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcsng" name="Is16BitsSingleCollectorRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcsng" name="Is16BitsSingleCollectorRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcsng" name="IsSingleCollectorRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="rwspcsng" name="IsSingleCollectorRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/semicong.omdoc b/content/http..www.gap-system.org/lib/semicong.omdoc
index bf771d27c036a6c37e063d333a18a9564b46fa79..243d28494dc714e6f8636c8af3d4fd0202968b00 100644
--- a/content/http..www.gap-system.org/lib/semicong.omdoc
+++ b/content/http..www.gap-system.org/lib/semicong.omdoc
@@ -6,7 +6,7 @@
       </om:OMA></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?semicong"></import><constant name="IsReesCongruence">
+     </constant><constant name="IsReesCongruence">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
diff --git a/content/http..www.gap-system.org/lib/semiquo.omdoc b/content/http..www.gap-system.org/lib/semiquo.omdoc
index 595242f73e44df26f749da89609dc0dd49f74a56..314b015e4a128bbc3015b2d784b7204472312b90 100644
--- a/content/http..www.gap-system.org/lib/semiquo.omdoc
+++ b/content/http..www.gap-system.org/lib/semiquo.omdoc
@@ -12,13 +12,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiquo" name="IsQuotientSemigroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -36,13 +36,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiquo" name="IsQuotientSemigroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -60,13 +60,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiquo" name="IsQuotientSemigroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -84,13 +84,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiquo" name="IsQuotientSemigroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -108,13 +108,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiquo" name="IsQuotientSemigroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -132,13 +132,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiquo" name="IsQuotientSemigroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -162,13 +162,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiquo" name="IsQuotientSemigroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -186,13 +186,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiquo" name="IsQuotientSemigroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -216,13 +216,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiquo" name="IsQuotientSemigroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -246,13 +246,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiquo" name="IsQuotientSemigroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -270,13 +270,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiquo" name="IsQuotientSemigroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsMagma"></om:OMS>
       </om:OMA>
@@ -294,13 +294,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiquo" name="IsQuotientSemigroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsAssociative"></om:OMS>
       </om:OMA>
@@ -318,13 +318,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiquo" name="IsQuotientSemigroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsAssociative"></om:OMS>
       </om:OMA>
@@ -342,13 +342,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiquo" name="IsQuotientSemigroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsGeneratorsOfSemigroup"></om:OMS>
       </om:OMA>
@@ -366,13 +366,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semiquo" name="IsQuotientSemigroup"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsGeneratorsOfSemigroup"></om:OMS>
       </om:OMA>
@@ -381,7 +381,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?semiquo"></import><constant name="QuotientSemigroupPreimage">
+     </constant><constant name="QuotientSemigroupPreimage">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
diff --git a/content/http..www.gap-system.org/lib/semirel.omdoc b/content/http..www.gap-system.org/lib/semirel.omdoc
index 2dcfbdc8c8c8535810dc6d9fd19b00c503c47448..057f1c23be383405812e14038dfa1378ecd89d40 100644
--- a/content/http..www.gap-system.org/lib/semirel.omdoc
+++ b/content/http..www.gap-system.org/lib/semirel.omdoc
@@ -28,13 +28,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsEndoGeneralMapping"></om:OMS>
       </om:OMA>
@@ -52,13 +52,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsEndoGeneralMapping"></om:OMS>
       </om:OMA>
@@ -76,13 +76,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -100,13 +100,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -124,13 +124,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsReflexiveBinaryRelation"></om:OMS>
       </om:OMA>
@@ -148,13 +148,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsReflexiveBinaryRelation"></om:OMS>
       </om:OMA>
@@ -172,13 +172,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsSymmetricBinaryRelation"></om:OMS>
       </om:OMA>
@@ -196,13 +196,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsSymmetricBinaryRelation"></om:OMS>
       </om:OMA>
@@ -220,13 +220,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsTransitiveBinaryRelation"></om:OMS>
       </om:OMA>
@@ -244,13 +244,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsTransitiveBinaryRelation"></om:OMS>
       </om:OMA>
@@ -268,13 +268,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsPreOrderBinaryRelation"></om:OMS>
       </om:OMA>
@@ -292,13 +292,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsPreOrderBinaryRelation"></om:OMS>
       </om:OMA>
@@ -316,13 +316,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsEquivalenceRelation"></om:OMS>
       </om:OMA>
@@ -340,13 +340,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsEquivalenceRelation"></om:OMS>
       </om:OMA>
@@ -377,13 +377,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -401,13 +401,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -425,13 +425,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -449,13 +449,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -473,13 +473,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -497,13 +497,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsEquivalenceClass"></om:OMS>
       </om:OMA>
@@ -512,7 +512,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?semirel"></import><constant name="IsGreensJClass">
+     </constant><constant name="IsGreensJClass">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="category"></om:OMS></om:OMOBJ></type>
        
@@ -526,13 +526,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensJClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -550,13 +550,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensJClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -574,13 +574,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensJClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -598,13 +598,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensJClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -622,13 +622,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensJClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -646,13 +646,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensJClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsEquivalenceClass"></om:OMS>
       </om:OMA>
@@ -670,13 +670,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensJClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensClass"></om:OMS>
       </om:OMA>
@@ -715,13 +715,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensDClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -739,13 +739,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensDClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -763,13 +763,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensDClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -787,13 +787,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensDClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -811,13 +811,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensDClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -835,13 +835,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensDClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsEquivalenceClass"></om:OMS>
       </om:OMA>
@@ -859,13 +859,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensDClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensClass"></om:OMS>
       </om:OMA>
@@ -896,13 +896,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensRClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -920,13 +920,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensRClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -944,13 +944,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensRClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -968,13 +968,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensRClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -992,13 +992,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensRClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -1016,13 +1016,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensRClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsEquivalenceClass"></om:OMS>
       </om:OMA>
@@ -1040,13 +1040,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensRClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensClass"></om:OMS>
       </om:OMA>
@@ -1069,13 +1069,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensDRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsEndoGeneralMapping"></om:OMS>
       </om:OMA>
@@ -1093,13 +1093,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensDRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsEndoGeneralMapping"></om:OMS>
       </om:OMA>
@@ -1117,13 +1117,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensDRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -1141,13 +1141,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensDRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -1165,13 +1165,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensDRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsReflexiveBinaryRelation"></om:OMS>
       </om:OMA>
@@ -1189,13 +1189,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensDRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsReflexiveBinaryRelation"></om:OMS>
       </om:OMA>
@@ -1213,13 +1213,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensDRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsSymmetricBinaryRelation"></om:OMS>
       </om:OMA>
@@ -1237,13 +1237,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensDRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsSymmetricBinaryRelation"></om:OMS>
       </om:OMA>
@@ -1261,13 +1261,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensDRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsTransitiveBinaryRelation"></om:OMS>
       </om:OMA>
@@ -1285,13 +1285,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensDRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsTransitiveBinaryRelation"></om:OMS>
       </om:OMA>
@@ -1309,13 +1309,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensDRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsPreOrderBinaryRelation"></om:OMS>
       </om:OMA>
@@ -1333,13 +1333,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensDRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsPreOrderBinaryRelation"></om:OMS>
       </om:OMA>
@@ -1357,13 +1357,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensDRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsEquivalenceRelation"></om:OMS>
       </om:OMA>
@@ -1381,13 +1381,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensDRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsEquivalenceRelation"></om:OMS>
       </om:OMA>
@@ -1405,13 +1405,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensDRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensRelation"></om:OMS>
       </om:OMA>
@@ -1434,13 +1434,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensHClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -1458,13 +1458,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensHClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -1482,13 +1482,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensHClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1506,13 +1506,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensHClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1530,13 +1530,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensHClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -1554,13 +1554,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensHClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsEquivalenceClass"></om:OMS>
       </om:OMA>
@@ -1578,13 +1578,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensHClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensClass"></om:OMS>
       </om:OMA>
@@ -1631,13 +1631,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensHRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsEndoGeneralMapping"></om:OMS>
       </om:OMA>
@@ -1655,13 +1655,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensHRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsEndoGeneralMapping"></om:OMS>
       </om:OMA>
@@ -1679,13 +1679,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensHRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -1703,13 +1703,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensHRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -1727,13 +1727,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensHRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsReflexiveBinaryRelation"></om:OMS>
       </om:OMA>
@@ -1751,13 +1751,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensHRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsReflexiveBinaryRelation"></om:OMS>
       </om:OMA>
@@ -1775,13 +1775,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensHRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsSymmetricBinaryRelation"></om:OMS>
       </om:OMA>
@@ -1799,13 +1799,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensHRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsSymmetricBinaryRelation"></om:OMS>
       </om:OMA>
@@ -1823,13 +1823,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensHRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsTransitiveBinaryRelation"></om:OMS>
       </om:OMA>
@@ -1847,13 +1847,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensHRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsTransitiveBinaryRelation"></om:OMS>
       </om:OMA>
@@ -1871,13 +1871,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensHRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsPreOrderBinaryRelation"></om:OMS>
       </om:OMA>
@@ -1895,13 +1895,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensHRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsPreOrderBinaryRelation"></om:OMS>
       </om:OMA>
@@ -1919,13 +1919,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensHRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsEquivalenceRelation"></om:OMS>
       </om:OMA>
@@ -1943,13 +1943,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensHRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsEquivalenceRelation"></om:OMS>
       </om:OMA>
@@ -1967,13 +1967,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensHRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensRelation"></om:OMS>
       </om:OMA>
@@ -2094,13 +2094,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensLClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -2118,13 +2118,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensLClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -2142,13 +2142,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensLClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -2166,13 +2166,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensLClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -2190,13 +2190,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensLClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -2214,13 +2214,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensLClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsEquivalenceClass"></om:OMS>
       </om:OMA>
@@ -2238,13 +2238,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensLClass"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensClass"></om:OMS>
       </om:OMA>
@@ -2275,10 +2275,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsSemigroupHomomorphismByImagesRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsSemigroupHomomorphismByImagesRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -2293,10 +2293,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsSemigroupHomomorphismByImagesRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsSemigroupHomomorphismByImagesRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -2316,13 +2316,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensJRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsEndoGeneralMapping"></om:OMS>
       </om:OMA>
@@ -2340,13 +2340,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensJRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsEndoGeneralMapping"></om:OMS>
       </om:OMA>
@@ -2364,13 +2364,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensJRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -2388,13 +2388,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensJRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -2412,13 +2412,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensJRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsReflexiveBinaryRelation"></om:OMS>
       </om:OMA>
@@ -2436,13 +2436,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensJRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsReflexiveBinaryRelation"></om:OMS>
       </om:OMA>
@@ -2460,13 +2460,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensJRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsSymmetricBinaryRelation"></om:OMS>
       </om:OMA>
@@ -2484,13 +2484,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensJRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsSymmetricBinaryRelation"></om:OMS>
       </om:OMA>
@@ -2508,13 +2508,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensJRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsTransitiveBinaryRelation"></om:OMS>
       </om:OMA>
@@ -2532,13 +2532,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensJRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsTransitiveBinaryRelation"></om:OMS>
       </om:OMA>
@@ -2556,13 +2556,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensJRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsPreOrderBinaryRelation"></om:OMS>
       </om:OMA>
@@ -2580,13 +2580,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensJRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsPreOrderBinaryRelation"></om:OMS>
       </om:OMA>
@@ -2604,13 +2604,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensJRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsEquivalenceRelation"></om:OMS>
       </om:OMA>
@@ -2628,13 +2628,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensJRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsEquivalenceRelation"></om:OMS>
       </om:OMA>
@@ -2652,13 +2652,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensJRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensRelation"></om:OMS>
       </om:OMA>
@@ -2729,13 +2729,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensLRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsEndoGeneralMapping"></om:OMS>
       </om:OMA>
@@ -2753,13 +2753,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensLRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsEndoGeneralMapping"></om:OMS>
       </om:OMA>
@@ -2777,13 +2777,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensLRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -2801,13 +2801,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensLRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -2825,13 +2825,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensLRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsReflexiveBinaryRelation"></om:OMS>
       </om:OMA>
@@ -2849,13 +2849,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensLRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsReflexiveBinaryRelation"></om:OMS>
       </om:OMA>
@@ -2873,13 +2873,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensLRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsSymmetricBinaryRelation"></om:OMS>
       </om:OMA>
@@ -2897,13 +2897,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensLRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsSymmetricBinaryRelation"></om:OMS>
       </om:OMA>
@@ -2921,13 +2921,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensLRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsTransitiveBinaryRelation"></om:OMS>
       </om:OMA>
@@ -2945,13 +2945,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensLRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsTransitiveBinaryRelation"></om:OMS>
       </om:OMA>
@@ -2969,13 +2969,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensLRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsPreOrderBinaryRelation"></om:OMS>
       </om:OMA>
@@ -2993,13 +2993,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensLRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsPreOrderBinaryRelation"></om:OMS>
       </om:OMA>
@@ -3017,13 +3017,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensLRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsEquivalenceRelation"></om:OMS>
       </om:OMA>
@@ -3041,13 +3041,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensLRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsEquivalenceRelation"></om:OMS>
       </om:OMA>
@@ -3065,13 +3065,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensLRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensRelation"></om:OMS>
       </om:OMA>
@@ -3126,13 +3126,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensRRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsEndoGeneralMapping"></om:OMS>
       </om:OMA>
@@ -3150,13 +3150,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensRRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsEndoGeneralMapping"></om:OMS>
       </om:OMA>
@@ -3174,13 +3174,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensRRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -3198,13 +3198,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensRRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsTotal"></om:OMS>
       </om:OMA>
@@ -3222,13 +3222,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensRRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsReflexiveBinaryRelation"></om:OMS>
       </om:OMA>
@@ -3246,13 +3246,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensRRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsReflexiveBinaryRelation"></om:OMS>
       </om:OMA>
@@ -3270,13 +3270,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensRRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsSymmetricBinaryRelation"></om:OMS>
       </om:OMA>
@@ -3294,13 +3294,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensRRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsSymmetricBinaryRelation"></om:OMS>
       </om:OMA>
@@ -3318,13 +3318,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensRRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsTransitiveBinaryRelation"></om:OMS>
       </om:OMA>
@@ -3342,13 +3342,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensRRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsTransitiveBinaryRelation"></om:OMS>
       </om:OMA>
@@ -3366,13 +3366,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensRRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsPreOrderBinaryRelation"></om:OMS>
       </om:OMA>
@@ -3390,13 +3390,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensRRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsPreOrderBinaryRelation"></om:OMS>
       </om:OMA>
@@ -3414,13 +3414,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensRRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsEquivalenceRelation"></om:OMS>
       </om:OMA>
@@ -3438,13 +3438,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensRRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="relation" name="IsEquivalenceRelation"></om:OMS>
       </om:OMA>
@@ -3462,13 +3462,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensRRelation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsGreensRelation"></om:OMS>
       </om:OMA>
@@ -3499,10 +3499,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsSemigroupGeneralMappingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsSemigroupGeneralMappingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -3517,10 +3517,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsSemigroupGeneralMappingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsSemigroupGeneralMappingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -3535,10 +3535,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsSemigroupGeneralMappingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsSemigroupGeneralMappingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -3556,10 +3556,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsSemigroupGeneralMappingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsSemigroupGeneralMappingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -3577,10 +3577,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsSemigroupGeneralMappingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsSemigroupGeneralMappingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -3598,10 +3598,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsSemigroupGeneralMappingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsSemigroupGeneralMappingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -3619,10 +3619,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsSemigroupGeneralMappingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsSemigroupGeneralMappingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -3640,10 +3640,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsSemigroupGeneralMappingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsSemigroupGeneralMappingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -3661,10 +3661,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsSemigroupGeneralMappingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsSemigroupGeneralMappingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsGeneralMapping"></om:OMS>
       </om:OMA>
@@ -3682,10 +3682,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsSemigroupGeneralMappingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsSemigroupGeneralMappingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapping" name="IsSPGeneralMapping"></om:OMS>
       </om:OMA>
@@ -3703,10 +3703,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsSemigroupGeneralMappingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsSemigroupGeneralMappingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
@@ -3724,10 +3724,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsSemigroupGeneralMappingRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="semirel" name="IsSemigroupGeneralMappingRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="mapphomo" name="RespectsMultiplication"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/semiring.omdoc b/content/http..www.gap-system.org/lib/semiring.omdoc
index f8656a2b9fce234dc62ccda452defdf0a0000c7d..8854987305e8a4f5e51cba13550c3c7b8471bd5b 100644
--- a/content/http..www.gap-system.org/lib/semiring.omdoc
+++ b/content/http..www.gap-system.org/lib/semiring.omdoc
@@ -22,7 +22,7 @@
       </om:OMA></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?magma"></import><import from="http://www.gap-system.org/lib?addmagma"></import><import from="http://www.gap-system.org/lib?semiring"></import><constant name="GeneratorsOfSemiringWithZero">
+     </constant><import from="http://www.gap-system.org/lib?magma"></import><import from="http://www.gap-system.org/lib?addmagma"></import><constant name="GeneratorsOfSemiringWithZero">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
diff --git a/content/http..www.gap-system.org/lib/sgpres.omdoc b/content/http..www.gap-system.org/lib/sgpres.omdoc
index 9d2bf8220d34263dbb6f44f3fc75bc024fde938a..dd6e718fbf88708bd0066012cc34b42042160670 100644
--- a/content/http..www.gap-system.org/lib/sgpres.omdoc
+++ b/content/http..www.gap-system.org/lib/sgpres.omdoc
@@ -20,13 +20,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="sgpres" name="IsPresentation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="object" name="IsCopyable"></om:OMS>
       </om:OMA>
@@ -35,7 +35,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?sgpres"></import><constant name="PrimaryGeneratorWords">
+     </constant><constant name="PrimaryGeneratorWords">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
@@ -65,10 +65,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="sgpres" name="IsPresentationDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="sgpres" name="IsPresentationDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -83,10 +83,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="sgpres" name="IsPresentationDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="sgpres" name="IsPresentationDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/stbc.omdoc b/content/http..www.gap-system.org/lib/stbc.omdoc
index cb11ceda6c617e1f92aad59532bccb2913fa3480..39faeaae8c44e6f8e3d8bca3f6391f00624dae59 100644
--- a/content/http..www.gap-system.org/lib/stbc.omdoc
+++ b/content/http..www.gap-system.org/lib/stbc.omdoc
@@ -28,13 +28,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="stbc" name="IsPermOnEnumerator"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="permutat" name="IsPerm"></om:OMS>
       </om:OMA>
@@ -52,13 +52,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="stbc" name="IsPermOnEnumerator"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -76,13 +76,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="stbc" name="IsPermOnEnumerator"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -100,13 +100,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="stbc" name="IsPermOnEnumerator"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -124,13 +124,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="stbc" name="IsPermOnEnumerator"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -148,13 +148,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="stbc" name="IsPermOnEnumerator"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -172,13 +172,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="stbc" name="IsPermOnEnumerator"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -196,13 +196,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="stbc" name="IsPermOnEnumerator"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsFiniteOrderElement"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/stbcbckt.omdoc b/content/http..www.gap-system.org/lib/stbcbckt.omdoc
index 447a3b9fc483803d3a35bad4aa3db9d2c353c99d..0cd4f544b8b0402007abd193ad4ff4180d8850b6 100644
--- a/content/http..www.gap-system.org/lib/stbcbckt.omdoc
+++ b/content/http..www.gap-system.org/lib/stbcbckt.omdoc
@@ -12,10 +12,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="stbcbckt" name="IsSlicedPermInv"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="stbcbckt" name="IsSlicedPermInv"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="permutat" name="IsPerm"></om:OMS>
       </om:OMA>
@@ -33,10 +33,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="stbcbckt" name="IsSlicedPermInv"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="stbcbckt" name="IsSlicedPermInv"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -54,10 +54,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="stbcbckt" name="IsSlicedPermInv"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="stbcbckt" name="IsSlicedPermInv"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -75,10 +75,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="stbcbckt" name="IsSlicedPermInv"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="stbcbckt" name="IsSlicedPermInv"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -96,10 +96,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="stbcbckt" name="IsSlicedPermInv"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="stbcbckt" name="IsSlicedPermInv"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -117,10 +117,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="stbcbckt" name="IsSlicedPermInv"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="stbcbckt" name="IsSlicedPermInv"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -138,10 +138,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="stbcbckt" name="IsSlicedPermInv"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="stbcbckt" name="IsSlicedPermInv"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -159,10 +159,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="stbcbckt" name="IsSlicedPermInv"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="stbcbckt" name="IsSlicedPermInv"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsFiniteOrderElement"></om:OMS>
       </om:OMA>
@@ -185,10 +185,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="stbcbckt" name="IsSlicedPerm"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="stbcbckt" name="IsSlicedPerm"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="permutat" name="IsPerm"></om:OMS>
       </om:OMA>
@@ -206,10 +206,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="stbcbckt" name="IsSlicedPerm"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="stbcbckt" name="IsSlicedPerm"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -227,10 +227,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="stbcbckt" name="IsSlicedPerm"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="stbcbckt" name="IsSlicedPerm"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -248,10 +248,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="stbcbckt" name="IsSlicedPerm"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="stbcbckt" name="IsSlicedPerm"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -269,10 +269,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="stbcbckt" name="IsSlicedPerm"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="stbcbckt" name="IsSlicedPerm"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -290,10 +290,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="stbcbckt" name="IsSlicedPerm"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="stbcbckt" name="IsSlicedPerm"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -311,10 +311,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="stbcbckt" name="IsSlicedPerm"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="stbcbckt" name="IsSlicedPerm"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -332,10 +332,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="stbcbckt" name="IsSlicedPerm"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="stbcbckt" name="IsSlicedPerm"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsFiniteOrderElement"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/straight.omdoc b/content/http..www.gap-system.org/lib/straight.omdoc
index 53b84f3ccd98db581c4951074d4c835b9775b91c..6272387e5b76cb1e2795c30d1e5590bdbff86023 100644
--- a/content/http..www.gap-system.org/lib/straight.omdoc
+++ b/content/http..www.gap-system.org/lib/straight.omdoc
@@ -3,7 +3,7 @@
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="category"></om:OMS></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?straight"></import><constant name="LinesOfStraightLineProgram">
+     </constant><constant name="LinesOfStraightLineProgram">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
@@ -54,10 +54,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="straight" name="IsStraightLineProgElm"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="straight" name="IsStraightLineProgElm"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -72,10 +72,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="straight" name="IsStraightLineProgElm"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="straight" name="IsStraightLineProgElm"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -93,10 +93,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="straight" name="IsStraightLineProgElm"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="straight" name="IsStraightLineProgElm"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -114,10 +114,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="straight" name="IsStraightLineProgElm"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="straight" name="IsStraightLineProgElm"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -135,10 +135,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="straight" name="IsStraightLineProgElm"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="straight" name="IsStraightLineProgElm"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -156,10 +156,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="straight" name="IsStraightLineProgElm"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="straight" name="IsStraightLineProgElm"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -177,10 +177,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="straight" name="IsStraightLineProgElm"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="straight" name="IsStraightLineProgElm"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="straight" name="StraightLineProgramElmRankFilter"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="straight" name="StraightLineProgramElmRankFilter"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/streams.omdoc b/content/http..www.gap-system.org/lib/streams.omdoc
index a147e1c1eba88ebd85c2c59fe58630c57738f726..63d99a6fda725c9b820aacb30c01472088c23f73 100644
--- a/content/http..www.gap-system.org/lib/streams.omdoc
+++ b/content/http..www.gap-system.org/lib/streams.omdoc
@@ -3,7 +3,7 @@
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="category"></om:OMS></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?streams"></import><constant name="IsOutputStream">
+     </constant><constant name="IsOutputStream">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="category"></om:OMS></om:OMOBJ></type>
        
@@ -17,13 +17,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="streams" name="IsOutputStream"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="streams" name="IsStream"></om:OMS>
       </om:OMA>
@@ -46,13 +46,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="streams" name="IsOutputTextStream"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="streams" name="IsStream"></om:OMS>
       </om:OMA>
@@ -70,13 +70,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="streams" name="IsOutputTextStream"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="streams" name="IsOutputStream"></om:OMS>
       </om:OMA>
@@ -99,13 +99,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="streams" name="IsOutputTextNone"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="streams" name="IsStream"></om:OMS>
       </om:OMA>
@@ -123,13 +123,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="streams" name="IsOutputTextNone"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="streams" name="IsOutputStream"></om:OMS>
       </om:OMA>
@@ -147,13 +147,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="streams" name="IsOutputTextNone"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="streams" name="IsOutputTextStream"></om:OMS>
       </om:OMA>
@@ -176,13 +176,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="streams" name="IsInputStream"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="streams" name="IsStream"></om:OMS>
       </om:OMA>
@@ -213,10 +213,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="streams" name="IsInputOutputStreamByPtyRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="streams" name="IsInputOutputStreamByPtyRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -244,13 +244,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="streams" name="IsInputOutputStream"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="streams" name="IsStream"></om:OMS>
       </om:OMA>
@@ -268,13 +268,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="streams" name="IsInputOutputStream"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="streams" name="IsInputStream"></om:OMS>
       </om:OMA>
@@ -292,13 +292,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="streams" name="IsInputOutputStream"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="streams" name="IsOutputStream"></om:OMS>
       </om:OMA>
@@ -353,13 +353,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="streams" name="IsInputTextStream"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="streams" name="IsStream"></om:OMS>
       </om:OMA>
@@ -377,13 +377,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="streams" name="IsInputTextStream"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="streams" name="IsInputStream"></om:OMS>
       </om:OMA>
@@ -406,10 +406,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="streams" name="IsOutputTextStringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="streams" name="IsOutputTextStringRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -434,10 +434,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="streams" name="IsInputTextNoneRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="streams" name="IsInputTextNoneRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -505,10 +505,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="streams" name="IsOutputTextNoneRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="streams" name="IsOutputTextNoneRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -528,10 +528,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="streams" name="IsInputTextFileRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="streams" name="IsInputTextFileRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -599,10 +599,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="streams" name="IsOutputTextFileRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="streams" name="IsOutputTextFileRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -638,13 +638,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="streams" name="IsInputTextNone"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="streams" name="IsStream"></om:OMS>
       </om:OMA>
@@ -662,13 +662,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="streams" name="IsInputTextNone"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="streams" name="IsInputStream"></om:OMS>
       </om:OMA>
@@ -686,13 +686,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="streams" name="IsInputTextNone"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="streams" name="IsInputTextStream"></om:OMS>
       </om:OMA>
@@ -723,10 +723,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="streams" name="IsInputTextStringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="streams" name="IsInputTextStringRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/string.omdoc b/content/http..www.gap-system.org/lib/string.omdoc
index b7f9d85811ae023027df0d5a6bac4f16a47bc10f..3056b57562c0f5132ad508e4f859a7e9313b9d68 100644
--- a/content/http..www.gap-system.org/lib/string.omdoc
+++ b/content/http..www.gap-system.org/lib/string.omdoc
@@ -12,13 +12,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="string" name="IsString"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsList"></om:OMS>
       </om:OMA>
@@ -36,13 +36,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="string" name="IsString"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDenseList"></om:OMS>
       </om:OMA>
@@ -60,13 +60,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="string" name="IsString"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsHomogeneousList"></om:OMS>
       </om:OMA>
@@ -84,13 +84,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="string" name="IsString"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -113,16 +113,16 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="string" name="IsStringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="string" name="IsStringRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsInternalRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsInternalRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?string"></import><constant name="SplitString">
+     </constant><constant name="SplitString">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
diff --git a/content/http..www.gap-system.org/lib/tom.omdoc b/content/http..www.gap-system.org/lib/tom.omdoc
index 745b2df16eab1944fe0016db3f0669e2e2a511b4..235d7670ba9c064f1c5a327c9068f6b658845fd2 100644
--- a/content/http..www.gap-system.org/lib/tom.omdoc
+++ b/content/http..www.gap-system.org/lib/tom.omdoc
@@ -3,7 +3,7 @@
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="category"></om:OMS></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?tom"></import><import from="http://www.gap-system.org/lib?cyclotom"></import><constant name="ContainingTom">
+     </constant><import from="http://www.gap-system.org/lib?cyclotom"></import><constant name="ContainingTom">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
diff --git a/content/http..www.gap-system.org/lib/trans.omdoc b/content/http..www.gap-system.org/lib/trans.omdoc
index c97062c1c1ab9bc37db751957315f847e72e03b8..363ec380d43cdad190a982285039153af90d8d96 100644
--- a/content/http..www.gap-system.org/lib/trans.omdoc
+++ b/content/http..www.gap-system.org/lib/trans.omdoc
@@ -28,13 +28,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="trans" name="IsTransformation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -52,13 +52,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="trans" name="IsTransformation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -76,13 +76,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="trans" name="IsTransformation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -100,13 +100,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="trans" name="IsTransformation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -124,13 +124,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="trans" name="IsTransformation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -148,13 +148,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="trans" name="IsTransformation"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -163,7 +163,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?trans"></import><constant name="OnKernelAntiAction">
+     </constant><constant name="OnKernelAntiAction">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
@@ -209,10 +209,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="trans" name="IsTrans4Rep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="trans" name="IsTrans4Rep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsInternalRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsInternalRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -280,10 +280,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="trans" name="IsTrans2Rep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="trans" name="IsTrans2Rep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsInternalRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsInternalRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/tuples.omdoc b/content/http..www.gap-system.org/lib/tuples.omdoc
index 37b44ef6a65a8c64d80f07f6f33e39830d4508ba..dc60ea18b00da9a3583746a54a69b7cdf3c8e8c5 100644
--- a/content/http..www.gap-system.org/lib/tuples.omdoc
+++ b/content/http..www.gap-system.org/lib/tuples.omdoc
@@ -28,13 +28,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="tuples" name="IsDirectProductElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="object" name="IsCopyable"></om:OMS>
       </om:OMA>
@@ -52,13 +52,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="tuples" name="IsDirectProductElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsList"></om:OMS>
       </om:OMA>
@@ -76,13 +76,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="tuples" name="IsDirectProductElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDenseList"></om:OMS>
       </om:OMA>
@@ -100,13 +100,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="tuples" name="IsDirectProductElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -124,13 +124,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="tuples" name="IsDirectProductElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -148,13 +148,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="tuples" name="IsDirectProductElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -172,13 +172,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="tuples" name="IsDirectProductElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -196,13 +196,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="tuples" name="IsDirectProductElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -220,13 +220,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="tuples" name="IsDirectProductElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -244,13 +244,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="tuples" name="IsDirectProductElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -268,13 +268,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="tuples" name="IsDirectProductElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -292,13 +292,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="tuples" name="IsDirectProductElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -316,13 +316,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="tuples" name="IsDirectProductElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -340,13 +340,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="tuples" name="IsDirectProductElement"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -355,7 +355,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?tuples"></import><constant name="ComponentsOfDirectProductElementsFamily">
+     </constant><constant name="ComponentsOfDirectProductElementsFamily">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
@@ -385,10 +385,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="tuples" name="IsDefaultDirectProductElementRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="tuples" name="IsDefaultDirectProductElementRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="object" name="IsCopyable"></om:OMS>
       </om:OMA>
@@ -406,10 +406,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="tuples" name="IsDefaultDirectProductElementRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="tuples" name="IsDefaultDirectProductElementRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsList"></om:OMS>
       </om:OMA>
@@ -427,10 +427,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="tuples" name="IsDefaultDirectProductElementRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="tuples" name="IsDefaultDirectProductElementRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDenseList"></om:OMS>
       </om:OMA>
@@ -448,10 +448,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="tuples" name="IsDefaultDirectProductElementRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="tuples" name="IsDefaultDirectProductElementRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -466,10 +466,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="tuples" name="IsDefaultDirectProductElementRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="tuples" name="IsDefaultDirectProductElementRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -487,10 +487,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="tuples" name="IsDefaultDirectProductElementRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="tuples" name="IsDefaultDirectProductElementRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -508,10 +508,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="tuples" name="IsDefaultDirectProductElementRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="tuples" name="IsDefaultDirectProductElementRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -529,10 +529,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="tuples" name="IsDefaultDirectProductElementRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="tuples" name="IsDefaultDirectProductElementRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -550,10 +550,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="tuples" name="IsDefaultDirectProductElementRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="tuples" name="IsDefaultDirectProductElementRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -571,10 +571,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="tuples" name="IsDefaultDirectProductElementRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="tuples" name="IsDefaultDirectProductElementRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -592,10 +592,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="tuples" name="IsDefaultDirectProductElementRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="tuples" name="IsDefaultDirectProductElementRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -613,10 +613,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="tuples" name="IsDefaultDirectProductElementRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="tuples" name="IsDefaultDirectProductElementRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -634,10 +634,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="tuples" name="IsDefaultDirectProductElementRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="tuples" name="IsDefaultDirectProductElementRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -655,10 +655,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="tuples" name="IsDefaultDirectProductElementRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="tuples" name="IsDefaultDirectProductElementRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -676,10 +676,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="tuples" name="IsDefaultDirectProductElementRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="tuples" name="IsDefaultDirectProductElementRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -697,10 +697,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="tuples" name="IsDefaultDirectProductElementRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="tuples" name="IsDefaultDirectProductElementRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="tuples" name="IsDirectProductElement"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/type.omdoc b/content/http..www.gap-system.org/lib/type.omdoc
index ab6473530cc420a85566514dd839ed28ae15a7e7..fba8e11e3d1327cdab86d2699acba82bca715207 100644
--- a/content/http..www.gap-system.org/lib/type.omdoc
+++ b/content/http..www.gap-system.org/lib/type.omdoc
@@ -8,7 +8,7 @@
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="filter"></om:OMS></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?type"></import><constant name="IsAttributeStoringRep">
+     </constant><constant name="IsAttributeStoringRep">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="filter"></om:OMS></om:OMOBJ></type>
        
@@ -22,10 +22,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -55,13 +55,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsFamilyOfFamilies"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsFamily"></om:OMS>
       </om:OMA>
@@ -84,10 +84,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsFamilyDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsFamilyDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -112,10 +112,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsNonAtomicComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsNonAtomicComponentObjectRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -135,13 +135,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsFamilyOfTypes"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsFamily"></om:OMS>
       </om:OMA>
@@ -164,10 +164,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsTypeDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsTypeDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -192,10 +192,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsReadOnlyPositionalObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsReadOnlyPositionalObjectRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -215,10 +215,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAtomicPositionalObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAtomicPositionalObjectRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/unknown.omdoc b/content/http..www.gap-system.org/lib/unknown.omdoc
index 720ec9a83d0363577e9490b0c32caadc36c5c66e..820c08978fd29bf5bcb36ded02f1157efe6352b1 100644
--- a/content/http..www.gap-system.org/lib/unknown.omdoc
+++ b/content/http..www.gap-system.org/lib/unknown.omdoc
@@ -12,13 +12,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="unknown" name="IsUnknown"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -36,13 +36,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="unknown" name="IsUnknown"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -60,13 +60,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="unknown" name="IsUnknown"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -84,13 +84,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="unknown" name="IsUnknown"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -108,13 +108,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="unknown" name="IsUnknown"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -132,13 +132,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="unknown" name="IsUnknown"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -156,13 +156,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="unknown" name="IsUnknown"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -180,13 +180,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="unknown" name="IsUnknown"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -204,13 +204,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="unknown" name="IsUnknown"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -228,13 +228,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="unknown" name="IsUnknown"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -252,13 +252,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="unknown" name="IsUnknown"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZDFRE"></om:OMS>
       </om:OMA>
@@ -276,13 +276,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="unknown" name="IsUnknown"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -300,13 +300,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="unknown" name="IsUnknown"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditivelyCommutativeElement"></om:OMS>
       </om:OMA>
@@ -324,13 +324,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="unknown" name="IsUnknown"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsCommutativeElement"></om:OMS>
       </om:OMA>
@@ -348,13 +348,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="unknown" name="IsUnknown"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsCyclotomic"></om:OMS>
       </om:OMA>
@@ -377,10 +377,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="unknown" name="IsUnknownDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="unknown" name="IsUnknownDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/vec8bit.omdoc b/content/http..www.gap-system.org/lib/vec8bit.omdoc
index 356c911a9d414ff76f1f63d7538450727a4ad3b7..af14ae976c4a2182af9e91e8055eee2823ea56d2 100644
--- a/content/http..www.gap-system.org/lib/vec8bit.omdoc
+++ b/content/http..www.gap-system.org/lib/vec8bit.omdoc
@@ -12,10 +12,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vec8bit" name="Is8BitVectorRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vec8bit" name="Is8BitVectorRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="object" name="IsCopyable"></om:OMS>
       </om:OMA>
@@ -33,10 +33,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vec8bit" name="Is8BitVectorRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vec8bit" name="Is8BitVectorRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsDataObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsDataObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -51,10 +51,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vec8bit" name="Is8BitVectorRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vec8bit" name="Is8BitVectorRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -72,10 +72,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vec8bit" name="Is8BitVectorRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vec8bit" name="Is8BitVectorRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -93,10 +93,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vec8bit" name="Is8BitVectorRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vec8bit" name="Is8BitVectorRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -114,10 +114,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vec8bit" name="Is8BitVectorRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vec8bit" name="Is8BitVectorRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -135,10 +135,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vec8bit" name="Is8BitVectorRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vec8bit" name="Is8BitVectorRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -156,10 +156,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vec8bit" name="Is8BitVectorRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vec8bit" name="Is8BitVectorRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -177,10 +177,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vec8bit" name="Is8BitVectorRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vec8bit" name="Is8BitVectorRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -198,10 +198,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vec8bit" name="Is8BitVectorRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vec8bit" name="Is8BitVectorRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsRowVectorObj"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/vecmat.omdoc b/content/http..www.gap-system.org/lib/vecmat.omdoc
index f8ba03b283b8d1dba471e709ce345a3ff59d5c42..ca2a0a580200c04049393e526a6f4ae80f33833b 100644
--- a/content/http..www.gap-system.org/lib/vecmat.omdoc
+++ b/content/http..www.gap-system.org/lib/vecmat.omdoc
@@ -20,10 +20,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vecmat" name="IsGF2VectorRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vecmat" name="IsGF2VectorRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="object" name="IsCopyable"></om:OMS>
       </om:OMA>
@@ -41,10 +41,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vecmat" name="IsGF2VectorRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vecmat" name="IsGF2VectorRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsDataObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsDataObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -59,10 +59,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vecmat" name="IsGF2VectorRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vecmat" name="IsGF2VectorRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -80,10 +80,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vecmat" name="IsGF2VectorRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vecmat" name="IsGF2VectorRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -101,10 +101,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vecmat" name="IsGF2VectorRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vecmat" name="IsGF2VectorRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -122,10 +122,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vecmat" name="IsGF2VectorRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vecmat" name="IsGF2VectorRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -143,10 +143,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vecmat" name="IsGF2VectorRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vecmat" name="IsGF2VectorRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -164,10 +164,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vecmat" name="IsGF2VectorRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vecmat" name="IsGF2VectorRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -185,10 +185,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vecmat" name="IsGF2VectorRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vecmat" name="IsGF2VectorRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -206,10 +206,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vecmat" name="IsGF2VectorRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vecmat" name="IsGF2VectorRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsRowVectorObj"></om:OMS>
       </om:OMA>
@@ -237,10 +237,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vecmat" name="IsGF2MatrixRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vecmat" name="IsGF2MatrixRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="object" name="IsCopyable"></om:OMS>
       </om:OMA>
@@ -258,10 +258,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vecmat" name="IsGF2MatrixRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vecmat" name="IsGF2MatrixRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -276,10 +276,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vecmat" name="IsGF2MatrixRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vecmat" name="IsGF2MatrixRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -297,10 +297,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vecmat" name="IsGF2MatrixRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vecmat" name="IsGF2MatrixRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -318,10 +318,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vecmat" name="IsGF2MatrixRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vecmat" name="IsGF2MatrixRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -339,10 +339,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vecmat" name="IsGF2MatrixRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vecmat" name="IsGF2MatrixRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -360,10 +360,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vecmat" name="IsGF2MatrixRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vecmat" name="IsGF2MatrixRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -381,10 +381,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vecmat" name="IsGF2MatrixRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vecmat" name="IsGF2MatrixRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -402,10 +402,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vecmat" name="IsGF2MatrixRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vecmat" name="IsGF2MatrixRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -423,10 +423,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vecmat" name="IsGF2MatrixRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vecmat" name="IsGF2MatrixRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -444,10 +444,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vecmat" name="IsGF2MatrixRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vecmat" name="IsGF2MatrixRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -465,10 +465,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vecmat" name="IsGF2MatrixRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vecmat" name="IsGF2MatrixRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -486,10 +486,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vecmat" name="IsGF2MatrixRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vecmat" name="IsGF2MatrixRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsMatrixObj"></om:OMS>
       </om:OMA>
@@ -507,10 +507,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vecmat" name="IsGF2MatrixRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vecmat" name="IsGF2MatrixRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="matobj1" name="IsRowListMatrix"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/vspc.omdoc b/content/http..www.gap-system.org/lib/vspc.omdoc
index cc7829be62b2d0e8b29a62d4fcddcd69b5605f3d..38d074ccfb47d69e209de59a40785f523208cc66 100644
--- a/content/http..www.gap-system.org/lib/vspc.omdoc
+++ b/content/http..www.gap-system.org/lib/vspc.omdoc
@@ -12,10 +12,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsSubspacesVectorSpaceDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsSubspacesVectorSpaceDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -35,10 +35,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -53,10 +53,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -71,10 +71,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -92,10 +92,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -113,10 +113,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -134,10 +134,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -155,10 +155,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -176,10 +176,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -203,10 +203,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -230,10 +230,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -257,10 +257,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -284,10 +284,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -311,10 +311,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -332,10 +332,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsExtLSet"></om:OMS>
       </om:OMA>
@@ -353,10 +353,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpEProd"></om:OMS>
       </om:OMA>
@@ -374,10 +374,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpDSum"></om:OMS>
       </om:OMA>
@@ -395,10 +395,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpESum"></om:OMS>
       </om:OMA>
@@ -416,10 +416,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsTrivialLOpEOne"></om:OMS>
       </om:OMA>
@@ -437,10 +437,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnByRing"></om:OMS>
       </om:OMA>
@@ -458,10 +458,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagma"></om:OMS>
       </om:OMA>
@@ -479,10 +479,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagmaWithZero"></om:OMS>
       </om:OMA>
@@ -500,10 +500,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveGroup"></om:OMS>
       </om:OMA>
@@ -521,10 +521,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -542,10 +542,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -563,10 +563,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFreeLeftModule"></om:OMS>
       </om:OMA>
@@ -584,10 +584,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianRowSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsHandledByNiceBasis"></om:OMS>
       </om:OMA>
@@ -770,10 +770,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsGaussianSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsGaussianSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -791,10 +791,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsGaussianSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsGaussianSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -812,10 +812,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsGaussianSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsGaussianSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -833,10 +833,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsGaussianSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsGaussianSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -854,10 +854,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsGaussianSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsGaussianSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -875,10 +875,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsGaussianSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsGaussianSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -902,10 +902,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsGaussianSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsGaussianSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -929,10 +929,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsGaussianSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsGaussianSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -956,10 +956,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsGaussianSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsGaussianSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -983,10 +983,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsGaussianSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsGaussianSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1010,10 +1010,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsGaussianSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsGaussianSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -1031,10 +1031,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsGaussianSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsGaussianSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsExtLSet"></om:OMS>
       </om:OMA>
@@ -1052,10 +1052,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsGaussianSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsGaussianSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpEProd"></om:OMS>
       </om:OMA>
@@ -1073,10 +1073,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsGaussianSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsGaussianSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpDSum"></om:OMS>
       </om:OMA>
@@ -1094,10 +1094,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsGaussianSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsGaussianSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpESum"></om:OMS>
       </om:OMA>
@@ -1115,10 +1115,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsGaussianSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsGaussianSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsTrivialLOpEOne"></om:OMS>
       </om:OMA>
@@ -1136,10 +1136,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsGaussianSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsGaussianSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnByRing"></om:OMS>
       </om:OMA>
@@ -1157,10 +1157,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsGaussianSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsGaussianSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnByDivisionRing"></om:OMS>
       </om:OMA>
@@ -1178,10 +1178,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsGaussianSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsGaussianSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnByDivisionRing"></om:OMS>
       </om:OMA>
@@ -1199,10 +1199,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsGaussianSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsGaussianSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagma"></om:OMS>
       </om:OMA>
@@ -1220,10 +1220,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsGaussianSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsGaussianSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagmaWithZero"></om:OMS>
       </om:OMA>
@@ -1241,10 +1241,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsGaussianSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsGaussianSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveGroup"></om:OMS>
       </om:OMA>
@@ -1262,10 +1262,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsGaussianSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsGaussianSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -1283,10 +1283,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsGaussianSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsGaussianSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -1304,10 +1304,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsGaussianSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsGaussianSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFreeLeftModule"></om:OMS>
       </om:OMA>
@@ -1316,7 +1316,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?vspc"></import><constant name="OrthogonalSpaceInFullRowSpace">
+     </constant><constant name="OrthogonalSpaceInFullRowSpace">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
@@ -1362,10 +1362,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1380,10 +1380,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -1398,10 +1398,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -1419,10 +1419,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -1440,10 +1440,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1461,10 +1461,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -1482,10 +1482,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -1503,10 +1503,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1530,10 +1530,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1557,10 +1557,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1584,10 +1584,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1611,10 +1611,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1638,10 +1638,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -1659,10 +1659,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsExtLSet"></om:OMS>
       </om:OMA>
@@ -1680,10 +1680,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpEProd"></om:OMS>
       </om:OMA>
@@ -1701,10 +1701,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpDSum"></om:OMS>
       </om:OMA>
@@ -1722,10 +1722,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpESum"></om:OMS>
       </om:OMA>
@@ -1743,10 +1743,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsTrivialLOpEOne"></om:OMS>
       </om:OMA>
@@ -1764,10 +1764,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnByRing"></om:OMS>
       </om:OMA>
@@ -1785,10 +1785,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagma"></om:OMS>
       </om:OMA>
@@ -1806,10 +1806,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagmaWithZero"></om:OMS>
       </om:OMA>
@@ -1827,10 +1827,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveGroup"></om:OMS>
       </om:OMA>
@@ -1848,10 +1848,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -1869,10 +1869,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -1890,10 +1890,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFreeLeftModule"></om:OMS>
       </om:OMA>
@@ -1911,10 +1911,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsNonGaussianMatrixSpace"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsHandledByNiceBasis"></om:OMS>
       </om:OMA>
@@ -2337,13 +2337,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsSubspacesVectorSpace"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -2361,13 +2361,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsSubspacesVectorSpace"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -2385,13 +2385,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsSubspacesVectorSpace"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsFinite"></om:OMS>
       </om:OMA>
@@ -2409,13 +2409,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsSubspacesVectorSpace"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsFinite"></om:OMS>
       </om:OMA>
@@ -2433,13 +2433,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsSubspacesVectorSpace"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -2457,13 +2457,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsSubspacesVectorSpace"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -2481,13 +2481,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsSubspacesVectorSpace"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/vspchom.omdoc b/content/http..www.gap-system.org/lib/vspchom.omdoc
index d460e97957ae9c75d0ea13f7825423582689a046..86cf987f1b55b093bfd5153c8dcdf9b8a0e2a04d 100644
--- a/content/http..www.gap-system.org/lib/vspchom.omdoc
+++ b/content/http..www.gap-system.org/lib/vspchom.omdoc
@@ -12,10 +12,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingByMatrixDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingByMatrixDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -30,10 +30,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingByMatrixDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingByMatrixDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -101,10 +101,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -119,10 +119,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -137,10 +137,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -158,10 +158,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -179,10 +179,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -200,10 +200,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDuplicateFree"></om:OMS>
       </om:OMA>
@@ -221,10 +221,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -242,10 +242,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -269,10 +269,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -296,10 +296,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -323,10 +323,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -350,10 +350,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -377,10 +377,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="domain" name="IsGeneralizedDomain"></om:OMS>
       </om:OMA>
@@ -398,10 +398,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsExtLSet"></om:OMS>
       </om:OMA>
@@ -419,10 +419,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsAssociativeLOpEProd"></om:OMS>
       </om:OMA>
@@ -440,10 +440,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpDSum"></om:OMS>
       </om:OMA>
@@ -461,10 +461,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsDistributiveLOpESum"></om:OMS>
       </om:OMA>
@@ -482,10 +482,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsTrivialLOpEOne"></om:OMS>
       </om:OMA>
@@ -503,10 +503,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="extlset" name="IsLeftActedOnByRing"></om:OMS>
       </om:OMA>
@@ -524,10 +524,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagma"></om:OMS>
       </om:OMA>
@@ -545,10 +545,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveMagmaWithZero"></om:OMS>
       </om:OMA>
@@ -566,10 +566,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsNearAdditiveGroup"></om:OMS>
       </om:OMA>
@@ -587,10 +587,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -608,10 +608,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="addmagma" name="IsAdditivelyCommutative"></om:OMS>
       </om:OMA>
@@ -629,10 +629,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFreeLeftModule"></om:OMS>
       </om:OMA>
@@ -650,10 +650,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFiniteDimensional"></om:OMS>
       </om:OMA>
@@ -671,10 +671,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsFiniteDimensional"></om:OMS>
       </om:OMA>
@@ -692,10 +692,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearMappingsModule"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="module" name="IsHandledByNiceBasis"></om:OMS>
       </om:OMA>
@@ -734,10 +734,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -752,10 +752,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearGeneralMappingByImagesDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspchom" name="IsLinearGeneralMappingByImagesDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/vspcmat.omdoc b/content/http..www.gap-system.org/lib/vspcmat.omdoc
index 6bb80489ba8387b62e7292c6256c2b09f91f6569..14ecad302728494805dc0850bd7d8951bb38f8fd 100644
--- a/content/http..www.gap-system.org/lib/vspcmat.omdoc
+++ b/content/http..www.gap-system.org/lib/vspcmat.omdoc
@@ -12,10 +12,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspcmat" name="IsSemiEchelonBasisOfGaussianMatrixSpaceRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspcmat" name="IsSemiEchelonBasisOfGaussianMatrixSpaceRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -30,10 +30,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspcmat" name="IsSemiEchelonBasisOfGaussianMatrixSpaceRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspcmat" name="IsSemiEchelonBasisOfGaussianMatrixSpaceRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -53,10 +53,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspcmat" name="IsMutableBasisOfGaussianMatrixSpaceRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspcmat" name="IsMutableBasisOfGaussianMatrixSpaceRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/vspcrow.omdoc b/content/http..www.gap-system.org/lib/vspcrow.omdoc
index cf0d6dd5d63d2d47d37ba25658e263bf4251c1d9..a2f7b7cbfe9c7f403c327515d455d431166ef9d3 100644
--- a/content/http..www.gap-system.org/lib/vspcrow.omdoc
+++ b/content/http..www.gap-system.org/lib/vspcrow.omdoc
@@ -12,10 +12,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspcrow" name="IsSubspacesFullRowSpaceDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspcrow" name="IsSubspacesFullRowSpaceDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -30,10 +30,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspcrow" name="IsSubspacesFullRowSpaceDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspcrow" name="IsSubspacesFullRowSpaceDefaultRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsSubspacesVectorSpaceDefaultRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspc" name="IsSubspacesVectorSpaceDefaultRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -53,10 +53,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspcrow" name="IsMutableBasisOfGaussianRowSpaceRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspcrow" name="IsMutableBasisOfGaussianRowSpaceRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -76,10 +76,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspcrow" name="IsSemiEchelonBasisOfGaussianRowSpaceRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspcrow" name="IsSemiEchelonBasisOfGaussianRowSpaceRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -94,10 +94,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspcrow" name="IsSemiEchelonBasisOfGaussianRowSpaceRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="vspcrow" name="IsSemiEchelonBasisOfGaussianRowSpaceRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/word.omdoc b/content/http..www.gap-system.org/lib/word.omdoc
index 2dd89dc82cb8c1dc5186b61530d92477897a8f77..c165c8042bb293166fe78c485b5e4a769cbba837 100644
--- a/content/http..www.gap-system.org/lib/word.omdoc
+++ b/content/http..www.gap-system.org/lib/word.omdoc
@@ -12,13 +12,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="word" name="IsWord"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -36,13 +36,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="word" name="IsWord"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -60,13 +60,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="word" name="IsWord"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -75,7 +75,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?word"></import><constant name="IsWordWithOne">
+     </constant><constant name="IsWordWithOne">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="filter"></om:OMS></om:OMOBJ></type>
        <definition><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
@@ -103,13 +103,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="word" name="IsNonassocWord"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -127,13 +127,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="word" name="IsNonassocWord"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -151,13 +151,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="word" name="IsNonassocWord"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -175,13 +175,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="word" name="IsNonassocWord"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="word" name="IsWord"></om:OMS>
       </om:OMA>
@@ -204,13 +204,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="word" name="IsNonassocWordWithOneFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsFamily"></om:OMS>
       </om:OMA>
@@ -228,13 +228,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="word" name="IsNonassocWordWithOneFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -258,13 +258,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="word" name="IsNonassocWordWithOneFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -333,10 +333,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="word" name="IsBracketRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="word" name="IsBracketRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -390,13 +390,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="word" name="IsNonassocWordWithOneCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -414,13 +414,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="word" name="IsNonassocWordWithOneCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -438,13 +438,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="word" name="IsNonassocWordWithOneCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -462,13 +462,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="word" name="IsNonassocWordWithOneCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -492,13 +492,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="word" name="IsNonassocWordWithOneCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -516,13 +516,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="word" name="IsNonassocWordWithOneCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -546,13 +546,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="word" name="IsNonassocWordWithOneCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -576,13 +576,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="word" name="IsNonassocWordWithOneCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -606,13 +606,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="word" name="IsNonassocWordWithOneCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -636,13 +636,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="word" name="IsNonassocWordWithOneCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -666,13 +666,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="word" name="IsNonassocWordWithOneCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
diff --git a/content/http..www.gap-system.org/lib/wordass.omdoc b/content/http..www.gap-system.org/lib/wordass.omdoc
index 7d251068af1d4a05b9e4cae083987f09ae6d768d..e5b7356533d127a44b9c9ae72f55fbd6ff54ec09 100644
--- a/content/http..www.gap-system.org/lib/wordass.omdoc
+++ b/content/http..www.gap-system.org/lib/wordass.omdoc
@@ -12,13 +12,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsSyllableWordsFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsFamily"></om:OMS>
       </om:OMA>
@@ -36,13 +36,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsSyllableWordsFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -85,7 +85,7 @@
       </om:OMA>
       </om:OMA></om:OMOBJ></definition>
        
-     </constant><import from="http://www.gap-system.org/lib?wordass"></import><constant name="Is16BitsFamily">
+     </constant><constant name="Is16BitsFamily">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="category"></om:OMS></om:OMOBJ></type>
        
@@ -99,13 +99,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="Is16BitsFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsFamily"></om:OMS>
       </om:OMA>
@@ -123,13 +123,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="Is16BitsFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -159,13 +159,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="Is16BitsFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsSyllableWordsFamily"></om:OMS>
       </om:OMA>
@@ -204,13 +204,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -228,13 +228,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -252,13 +252,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -276,13 +276,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -306,13 +306,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -330,13 +330,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -360,13 +360,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -390,13 +390,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -420,13 +420,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsGeneratorsOfSemigroup"></om:OMS>
       </om:OMA>
@@ -444,13 +444,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsGeneratorsOfSemigroup"></om:OMS>
       </om:OMA>
@@ -468,13 +468,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -498,13 +498,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -539,10 +539,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsSyllableAssocWordRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsSyllableAssocWordRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -560,10 +560,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsSyllableAssocWordRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsSyllableAssocWordRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -581,10 +581,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsSyllableAssocWordRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsSyllableAssocWordRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -602,10 +602,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsSyllableAssocWordRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsSyllableAssocWordRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -623,10 +623,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsSyllableAssocWordRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsSyllableAssocWordRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="word" name="IsWord"></om:OMS>
       </om:OMA>
@@ -657,13 +657,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsInfBitsFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsFamily"></om:OMS>
       </om:OMA>
@@ -681,13 +681,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsInfBitsFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -717,13 +717,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsInfBitsFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsSyllableWordsFamily"></om:OMS>
       </om:OMA>
@@ -746,13 +746,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsLetterWordsFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsFamily"></om:OMS>
       </om:OMA>
@@ -770,13 +770,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsLetterWordsFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -811,13 +811,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsWLetterWordsFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsFamily"></om:OMS>
       </om:OMA>
@@ -835,13 +835,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsWLetterWordsFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -871,13 +871,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsWLetterWordsFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsLetterWordsFamily"></om:OMS>
       </om:OMA>
@@ -924,13 +924,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsFamily"></om:OMS>
       </om:OMA>
@@ -948,13 +948,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1029,13 +1029,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordWithOneFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsFamily"></om:OMS>
       </om:OMA>
@@ -1053,13 +1053,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordWithOneFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1089,13 +1089,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordWithOneFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1192,13 +1192,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordWithOneCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -1216,13 +1216,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordWithOneCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -1240,13 +1240,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordWithOneCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -1264,13 +1264,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordWithOneCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1294,13 +1294,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordWithOneCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -1318,13 +1318,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordWithOneCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1348,13 +1348,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordWithOneCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1378,13 +1378,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordWithOneCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1408,13 +1408,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordWithOneCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1438,13 +1438,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordWithOneCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsGeneratorsOfSemigroup"></om:OMS>
       </om:OMA>
@@ -1462,13 +1462,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordWithOneCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsGeneratorsOfSemigroup"></om:OMS>
       </om:OMA>
@@ -1486,13 +1486,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordWithOneCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1516,13 +1516,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordWithOneCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1552,13 +1552,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordWithOneCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1605,13 +1605,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordWithInverseFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsFamily"></om:OMS>
       </om:OMA>
@@ -1629,13 +1629,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordWithInverseFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1665,13 +1665,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordWithInverseFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1713,13 +1713,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordWithInverseFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1766,13 +1766,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="Is8BitsFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsFamily"></om:OMS>
       </om:OMA>
@@ -1790,13 +1790,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="Is8BitsFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1826,13 +1826,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="Is8BitsFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsSyllableWordsFamily"></om:OMS>
       </om:OMA>
@@ -1875,13 +1875,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="Is32BitsFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsFamily"></om:OMS>
       </om:OMA>
@@ -1899,13 +1899,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="Is32BitsFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -1935,13 +1935,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="Is32BitsFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsSyllableWordsFamily"></om:OMS>
       </om:OMA>
@@ -2008,13 +2008,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordWithInverseCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -2032,13 +2032,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordWithInverseCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsCollection"></om:OMS>
       </om:OMA>
@@ -2056,13 +2056,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordWithInverseCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -2080,13 +2080,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordWithInverseCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2110,13 +2110,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordWithInverseCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -2134,13 +2134,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordWithInverseCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2164,13 +2164,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordWithInverseCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2194,13 +2194,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordWithInverseCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2224,13 +2224,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordWithInverseCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2254,13 +2254,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordWithInverseCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2284,13 +2284,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordWithInverseCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsGeneratorsOfMagmaWithInverses"></om:OMS>
       </om:OMA>
@@ -2308,13 +2308,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordWithInverseCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="magma" name="IsGeneratorsOfMagmaWithInverses"></om:OMS>
       </om:OMA>
@@ -2332,13 +2332,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordWithInverseCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsGeneratorsOfSemigroup"></om:OMS>
       </om:OMA>
@@ -2356,13 +2356,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordWithInverseCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="semigrp" name="IsGeneratorsOfSemigroup"></om:OMS>
       </om:OMA>
@@ -2380,13 +2380,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordWithInverseCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2410,13 +2410,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordWithInverseCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2446,13 +2446,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordWithInverseCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2494,13 +2494,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsAssocWordWithInverseCollection"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2547,10 +2547,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsLetterAssocWordRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsLetterAssocWordRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -2568,10 +2568,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsLetterAssocWordRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsLetterAssocWordRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -2589,10 +2589,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsLetterAssocWordRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsLetterAssocWordRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -2610,10 +2610,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsLetterAssocWordRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsLetterAssocWordRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -2631,10 +2631,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsLetterAssocWordRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsLetterAssocWordRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="word" name="IsWord"></om:OMS>
       </om:OMA>
@@ -2657,10 +2657,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsWLetterAssocWordRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsWLetterAssocWordRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -2678,10 +2678,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsWLetterAssocWordRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsWLetterAssocWordRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -2699,10 +2699,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsWLetterAssocWordRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsWLetterAssocWordRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -2720,10 +2720,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsWLetterAssocWordRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsWLetterAssocWordRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -2741,10 +2741,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsWLetterAssocWordRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsWLetterAssocWordRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="word" name="IsWord"></om:OMS>
       </om:OMA>
@@ -2762,10 +2762,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsWLetterAssocWordRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsWLetterAssocWordRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsLetterAssocWordRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsLetterAssocWordRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -2793,13 +2793,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsBLetterWordsFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsFamily"></om:OMS>
       </om:OMA>
@@ -2817,13 +2817,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsBLetterWordsFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
@@ -2853,13 +2853,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsBLetterWordsFamily"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsLetterWordsFamily"></om:OMS>
       </om:OMA>
@@ -2882,10 +2882,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsBLetterAssocWordRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsBLetterAssocWordRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -2903,10 +2903,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsBLetterAssocWordRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsBLetterAssocWordRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -2924,10 +2924,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsBLetterAssocWordRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsBLetterAssocWordRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -2945,10 +2945,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsBLetterAssocWordRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsBLetterAssocWordRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -2966,10 +2966,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsBLetterAssocWordRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsBLetterAssocWordRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="word" name="IsWord"></om:OMS>
       </om:OMA>
@@ -2987,10 +2987,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsBLetterAssocWordRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsBLetterAssocWordRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsLetterAssocWordRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsLetterAssocWordRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/wordrep.omdoc b/content/http..www.gap-system.org/lib/wordrep.omdoc
index 26d51113f42b451fb098077cb17bb4d28811d93f..0d84172d013ea1a1afb805e6494a480da61961ab 100644
--- a/content/http..www.gap-system.org/lib/wordrep.omdoc
+++ b/content/http..www.gap-system.org/lib/wordrep.omdoc
@@ -12,10 +12,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="IsInfiniteListOfNamesRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="IsInfiniteListOfNamesRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -35,10 +35,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="IsInfiniteListOfGeneratorsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="IsInfiniteListOfGeneratorsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -58,10 +58,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="Is32BitsAssocWord"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="Is32BitsAssocWord"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsDataObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsDataObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -76,10 +76,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="Is32BitsAssocWord"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="Is32BitsAssocWord"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -97,10 +97,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="Is32BitsAssocWord"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="Is32BitsAssocWord"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -118,10 +118,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="Is32BitsAssocWord"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="Is32BitsAssocWord"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -139,10 +139,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="Is32BitsAssocWord"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="Is32BitsAssocWord"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -160,10 +160,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="Is32BitsAssocWord"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="Is32BitsAssocWord"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="word" name="IsWord"></om:OMS>
       </om:OMA>
@@ -181,10 +181,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="Is32BitsAssocWord"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="Is32BitsAssocWord"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsSyllableAssocWordRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsSyllableAssocWordRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -204,10 +204,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="Is16BitsAssocWord"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="Is16BitsAssocWord"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsDataObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsDataObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -222,10 +222,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="Is16BitsAssocWord"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="Is16BitsAssocWord"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -243,10 +243,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="Is16BitsAssocWord"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="Is16BitsAssocWord"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -264,10 +264,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="Is16BitsAssocWord"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="Is16BitsAssocWord"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -285,10 +285,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="Is16BitsAssocWord"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="Is16BitsAssocWord"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -306,10 +306,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="Is16BitsAssocWord"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="Is16BitsAssocWord"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="word" name="IsWord"></om:OMS>
       </om:OMA>
@@ -327,10 +327,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="Is16BitsAssocWord"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="Is16BitsAssocWord"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsSyllableAssocWordRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsSyllableAssocWordRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -350,10 +350,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="Is8BitsAssocWord"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="Is8BitsAssocWord"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsDataObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsDataObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -368,10 +368,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="Is8BitsAssocWord"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="Is8BitsAssocWord"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -389,10 +389,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="Is8BitsAssocWord"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="Is8BitsAssocWord"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -410,10 +410,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="Is8BitsAssocWord"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="Is8BitsAssocWord"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -431,10 +431,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="Is8BitsAssocWord"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="Is8BitsAssocWord"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -452,10 +452,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="Is8BitsAssocWord"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="Is8BitsAssocWord"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="word" name="IsWord"></om:OMS>
       </om:OMA>
@@ -473,10 +473,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="Is8BitsAssocWord"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="Is8BitsAssocWord"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsSyllableAssocWordRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsSyllableAssocWordRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -496,10 +496,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="IsInfBitsAssocWord"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="IsInfBitsAssocWord"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -514,10 +514,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="IsInfBitsAssocWord"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="IsInfBitsAssocWord"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -535,10 +535,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="IsInfBitsAssocWord"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="IsInfBitsAssocWord"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -556,10 +556,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="IsInfBitsAssocWord"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="IsInfBitsAssocWord"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -577,10 +577,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="IsInfBitsAssocWord"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="IsInfBitsAssocWord"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -598,10 +598,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="IsInfBitsAssocWord"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="IsInfBitsAssocWord"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="word" name="IsWord"></om:OMS>
       </om:OMA>
@@ -619,10 +619,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="IsInfBitsAssocWord"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordrep" name="IsInfBitsAssocWord"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsSyllableAssocWordRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="wordass" name="IsSyllableAssocWordRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/wpobj.omdoc b/content/http..www.gap-system.org/lib/wpobj.omdoc
index 9e00ab6a78a8483123d8a407846750ac1f87cae5..7f7a419715ef40932443c7a47691fc2d500481d5 100644
--- a/content/http..www.gap-system.org/lib/wpobj.omdoc
+++ b/content/http..www.gap-system.org/lib/wpobj.omdoc
@@ -12,13 +12,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wpobj" name="IsWeakPointerObject"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsList"></om:OMS>
       </om:OMA>
@@ -36,13 +36,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wpobj" name="IsWeakPointerObject"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -60,13 +60,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wpobj" name="IsWeakPointerObject"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsFinite"></om:OMS>
       </om:OMA>
@@ -84,13 +84,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wpobj" name="IsWeakPointerObject"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsFinite"></om:OMS>
       </om:OMA>
@@ -108,13 +108,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wpobj" name="IsWeakPointerObject"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="propertyFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsSmallList"></om:OMS>
       </om:OMA>
@@ -132,13 +132,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="wpobj" name="IsWeakPointerObject"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="Has"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsSmallList"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/lib/zmodnz.omdoc b/content/http..www.gap-system.org/lib/zmodnz.omdoc
index b5e074dda4487cf4c5f3bd692b607e225e243be6..73305fa29c5bb51bbeb22d3d1b372263fed7053f 100644
--- a/content/http..www.gap-system.org/lib/zmodnz.omdoc
+++ b/content/http..www.gap-system.org/lib/zmodnz.omdoc
@@ -12,13 +12,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="zmodnz" name="IsZmodnZObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -36,13 +36,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="zmodnz" name="IsZmodnZObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -60,13 +60,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="zmodnz" name="IsZmodnZObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -84,13 +84,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="zmodnz" name="IsZmodnZObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -108,13 +108,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="zmodnz" name="IsZmodnZObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -132,13 +132,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="zmodnz" name="IsZmodnZObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -156,13 +156,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="zmodnz" name="IsZmodnZObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -180,13 +180,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="zmodnz" name="IsZmodnZObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -204,13 +204,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="zmodnz" name="IsZmodnZObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -228,13 +228,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="zmodnz" name="IsZmodnZObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -252,13 +252,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="zmodnz" name="IsZmodnZObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -276,13 +276,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="zmodnz" name="IsZmodnZObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditivelyCommutativeElement"></om:OMS>
       </om:OMA>
@@ -300,13 +300,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="zmodnz" name="IsZmodnZObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsCommutativeElement"></om:OMS>
       </om:OMA>
@@ -315,7 +315,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?ffe"></import><import from="http://www.gap-system.org/lib?zmodnz"></import><constant name="IsZmodpZObjSmall">
+     </constant><import from="http://www.gap-system.org/lib?ffe"></import><constant name="IsZmodpZObjSmall">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="filter"></om:OMS></om:OMOBJ></type>
        <definition><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
@@ -349,13 +349,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="zmodnz" name="IsZmodnZObjNonprime"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -373,13 +373,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="zmodnz" name="IsZmodnZObjNonprime"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -397,13 +397,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="zmodnz" name="IsZmodnZObjNonprime"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -421,13 +421,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="zmodnz" name="IsZmodnZObjNonprime"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -445,13 +445,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="zmodnz" name="IsZmodnZObjNonprime"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -469,13 +469,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="zmodnz" name="IsZmodnZObjNonprime"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -493,13 +493,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="zmodnz" name="IsZmodnZObjNonprime"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -517,13 +517,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="zmodnz" name="IsZmodnZObjNonprime"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -541,13 +541,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="zmodnz" name="IsZmodnZObjNonprime"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -565,13 +565,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="zmodnz" name="IsZmodnZObjNonprime"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -589,13 +589,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="zmodnz" name="IsZmodnZObjNonprime"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -613,13 +613,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="zmodnz" name="IsZmodnZObjNonprime"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditivelyCommutativeElement"></om:OMS>
       </om:OMA>
@@ -637,13 +637,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="zmodnz" name="IsZmodnZObjNonprime"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsCommutativeElement"></om:OMS>
       </om:OMA>
@@ -661,13 +661,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="zmodnz" name="IsZmodnZObjNonprime"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="zmodnz" name="IsZmodnZObj"></om:OMS>
       </om:OMA>
@@ -726,10 +726,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="zmodnz" name="IsModulusRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="zmodnz" name="IsModulusRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/lib/zmodnze.omdoc b/content/http..www.gap-system.org/lib/zmodnze.omdoc
index a9160aa604dc475ad6ddb51a0374d7e66043e5df..410476b5395094a46e568d6ac312fff0aa76fb5e 100644
--- a/content/http..www.gap-system.org/lib/zmodnze.omdoc
+++ b/content/http..www.gap-system.org/lib/zmodnze.omdoc
@@ -20,13 +20,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="zmodnze" name="IsZmodnZepsObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -44,13 +44,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="zmodnze" name="IsZmodnZepsObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -68,13 +68,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="zmodnze" name="IsZmodnZepsObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -92,13 +92,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="zmodnze" name="IsZmodnZepsObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -116,13 +116,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="zmodnze" name="IsZmodnZepsObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -140,13 +140,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="zmodnze" name="IsZmodnZepsObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -164,13 +164,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="zmodnze" name="IsZmodnZepsObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -188,13 +188,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="zmodnze" name="IsZmodnZepsObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -212,13 +212,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="zmodnze" name="IsZmodnZepsObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -236,13 +236,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="zmodnze" name="IsZmodnZepsObj"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -251,7 +251,7 @@
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/lib?zmodnze"></import><constant name="Cyclotomic">
+     </constant><constant name="Cyclotomic">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
@@ -273,10 +273,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="zmodnze" name="IsZmodnZepsRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="zmodnze" name="IsZmodnZepsRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsPositionalObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/content/http..www.gap-system.org/pkg/GAPDoc-1.5.1/lib/$Unicode$Tools.omdoc b/content/http..www.gap-system.org/pkg/GAPDoc-1.5.1/lib/$Unicode$Tools.omdoc
index 1caa9567e4a844de611f5a615e86d14bd664c83f..9e7092b5ae1bff7b6aab6dbc1da2c5f997807f4e 100644
--- a/content/http..www.gap-system.org/pkg/GAPDoc-1.5.1/lib/$Unicode$Tools.omdoc
+++ b/content/http..www.gap-system.org/pkg/GAPDoc-1.5.1/lib/$Unicode$Tools.omdoc
@@ -12,10 +12,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib" module="UnicodeTools" name="IsUnicodeString"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib" module="UnicodeTools" name="IsUnicodeString"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsList"></om:OMS>
       </om:OMA>
@@ -33,10 +33,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib" module="UnicodeTools" name="IsUnicodeString"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib" module="UnicodeTools" name="IsUnicodeString"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsDenseList"></om:OMS>
       </om:OMA>
@@ -54,10 +54,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib" module="UnicodeTools" name="IsUnicodeString"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib" module="UnicodeTools" name="IsUnicodeString"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsHomogeneousList"></om:OMS>
       </om:OMA>
@@ -75,10 +75,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib" module="UnicodeTools" name="IsUnicodeString"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib" module="UnicodeTools" name="IsUnicodeString"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="string" name="IsString"></om:OMS>
       </om:OMA>
@@ -96,10 +96,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib" module="UnicodeTools" name="IsUnicodeString"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib" module="UnicodeTools" name="IsUnicodeString"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="coll" name="IsListOrCollection"></om:OMS>
       </om:OMA>
@@ -117,10 +117,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib" module="UnicodeTools" name="IsUnicodeString"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib" module="UnicodeTools" name="IsUnicodeString"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="list" name="IsConstantTimeAccessList"></om:OMS>
       </om:OMA>
@@ -137,7 +137,7 @@
       </om:OMA></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?UnicodeTools"></import><constant name="Encode">
+     </constant><constant name="Encode">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
@@ -167,10 +167,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib" module="UnicodeTools" name="IsUnicodeCharacter"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib" module="UnicodeTools" name="IsUnicodeCharacter"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsInt"></om:OMS>
       </om:OMA>
@@ -188,10 +188,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib" module="UnicodeTools" name="IsUnicodeCharacter"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib" module="UnicodeTools" name="IsUnicodeCharacter"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsRat"></om:OMS>
       </om:OMA>
@@ -209,10 +209,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib" module="UnicodeTools" name="IsUnicodeCharacter"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib" module="UnicodeTools" name="IsUnicodeCharacter"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsCyc"></om:OMS>
       </om:OMA>
@@ -230,10 +230,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib" module="UnicodeTools" name="IsUnicodeCharacter"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib" module="UnicodeTools" name="IsUnicodeCharacter"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtAElement"></om:OMS>
       </om:OMA>
@@ -251,10 +251,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib" module="UnicodeTools" name="IsUnicodeCharacter"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib" module="UnicodeTools" name="IsUnicodeCharacter"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElement"></om:OMS>
       </om:OMA>
@@ -272,10 +272,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib" module="UnicodeTools" name="IsUnicodeCharacter"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib" module="UnicodeTools" name="IsUnicodeCharacter"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithZero"></om:OMS>
       </om:OMA>
@@ -293,10 +293,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib" module="UnicodeTools" name="IsUnicodeCharacter"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib" module="UnicodeTools" name="IsUnicodeCharacter"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsNearAdditiveElementWithInverse"></om:OMS>
       </om:OMA>
@@ -314,10 +314,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib" module="UnicodeTools" name="IsUnicodeCharacter"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib" module="UnicodeTools" name="IsUnicodeCharacter"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditiveElement"></om:OMS>
       </om:OMA>
@@ -335,10 +335,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib" module="UnicodeTools" name="IsUnicodeCharacter"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib" module="UnicodeTools" name="IsUnicodeCharacter"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtLElement"></om:OMS>
       </om:OMA>
@@ -356,10 +356,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib" module="UnicodeTools" name="IsUnicodeCharacter"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib" module="UnicodeTools" name="IsUnicodeCharacter"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsExtRElement"></om:OMS>
       </om:OMA>
@@ -377,10 +377,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib" module="UnicodeTools" name="IsUnicodeCharacter"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib" module="UnicodeTools" name="IsUnicodeCharacter"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElement"></om:OMS>
       </om:OMA>
@@ -398,10 +398,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib" module="UnicodeTools" name="IsUnicodeCharacter"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib" module="UnicodeTools" name="IsUnicodeCharacter"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithOne"></om:OMS>
       </om:OMA>
@@ -419,10 +419,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib" module="UnicodeTools" name="IsUnicodeCharacter"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib" module="UnicodeTools" name="IsUnicodeCharacter"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsMultiplicativeElementWithInverse"></om:OMS>
       </om:OMA>
@@ -440,10 +440,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib" module="UnicodeTools" name="IsUnicodeCharacter"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib" module="UnicodeTools" name="IsUnicodeCharacter"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsZDFRE"></om:OMS>
       </om:OMA>
@@ -461,10 +461,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib" module="UnicodeTools" name="IsUnicodeCharacter"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib" module="UnicodeTools" name="IsUnicodeCharacter"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAssociativeElement"></om:OMS>
       </om:OMA>
@@ -482,10 +482,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib" module="UnicodeTools" name="IsUnicodeCharacter"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib" module="UnicodeTools" name="IsUnicodeCharacter"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsAdditivelyCommutativeElement"></om:OMS>
       </om:OMA>
@@ -503,10 +503,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib" module="UnicodeTools" name="IsUnicodeCharacter"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib" module="UnicodeTools" name="IsUnicodeCharacter"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="arith" name="IsCommutativeElement"></om:OMS>
       </om:OMA>
@@ -524,10 +524,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib" module="UnicodeTools" name="IsUnicodeCharacter"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib" module="UnicodeTools" name="IsUnicodeCharacter"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="string" name="IsChar"></om:OMS>
       </om:OMA>
@@ -545,10 +545,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib" module="UnicodeTools" name="IsUnicodeCharacter"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib" module="UnicodeTools" name="IsUnicodeCharacter"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="cyclotom" name="IsCyclotomic"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/pkg/io-4.4.4/gap/background.omdoc b/content/http..www.gap-system.org/pkg/io-4.4.4/gap/background.omdoc
index 39fd4c11acde1d056b43d5562bc9a25f55d7cae2..32af9883d3cefd2c08d1ce6ea9a702d02effe3b0 100644
--- a/content/http..www.gap-system.org/pkg/io-4.4.4/gap/background.omdoc
+++ b/content/http..www.gap-system.org/pkg/io-4.4.4/gap/background.omdoc
@@ -20,13 +20,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/pkg/io-4.4.4/gap" module="background" name="IsWorkerFarm"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -41,19 +41,19 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/pkg/io-4.4.4/gap" module="background" name="IsWorkerFarm"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/pkg/io-4.4.4/gap?background"></import><constant name="IsWorkerFarmByFork">
+     </constant><constant name="IsWorkerFarmByFork">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="filter"></om:OMS></om:OMOBJ></type>
        
@@ -67,10 +67,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/io-4.4.4/gap" module="background" name="IsWorkerFarmByFork"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/io-4.4.4/gap" module="background" name="IsWorkerFarmByFork"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -85,10 +85,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/io-4.4.4/gap" module="background" name="IsWorkerFarmByFork"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/io-4.4.4/gap" module="background" name="IsWorkerFarmByFork"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -103,10 +103,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/io-4.4.4/gap" module="background" name="IsWorkerFarmByFork"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/io-4.4.4/gap" module="background" name="IsWorkerFarmByFork"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/pkg/io-4.4.4/gap" module="background" name="IsWorkerFarm"></om:OMS>
       </om:OMA>
@@ -137,13 +137,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/pkg/io-4.4.4/gap" module="background" name="IsBackgroundJob"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -158,13 +158,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/pkg/io-4.4.4/gap" module="background" name="IsBackgroundJob"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -232,10 +232,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/io-4.4.4/gap" module="background" name="IsBackgroundJobByFork"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/io-4.4.4/gap" module="background" name="IsBackgroundJobByFork"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -250,10 +250,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/io-4.4.4/gap" module="background" name="IsBackgroundJobByFork"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/io-4.4.4/gap" module="background" name="IsBackgroundJobByFork"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsAttributeStoringRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -268,10 +268,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/io-4.4.4/gap" module="background" name="IsBackgroundJobByFork"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/io-4.4.4/gap" module="background" name="IsBackgroundJobByFork"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/pkg/io-4.4.4/gap" module="background" name="IsBackgroundJob"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/pkg/io-4.4.4/gap/io.omdoc b/content/http..www.gap-system.org/pkg/io-4.4.4/gap/io.omdoc
index 99c4dac7aa893d491779c83301f9379018f9e121..22dc6b6235c31ac7183fda39c68167cc76cd6685 100644
--- a/content/http..www.gap-system.org/pkg/io-4.4.4/gap/io.omdoc
+++ b/content/http..www.gap-system.org/pkg/io-4.4.4/gap/io.omdoc
@@ -12,13 +12,13 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/pkg/io-4.4.4/gap" module="io" name="IO_Result"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -29,7 +29,7 @@
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="category"></om:OMS></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/pkg/io-4.4.4/gap?io"></import><constant name="ProcessID">
+     </constant><constant name="ProcessID">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
diff --git a/content/http..www.gap-system.org/pkg/io-4.4.4/gap/iohub.omdoc b/content/http..www.gap-system.org/pkg/io-4.4.4/gap/iohub.omdoc
index be3e2fda8f51e23653d783b1fa3a531102c08a10..32d60a35abcbb59bf5fb9dc3cf3e96230876f2fb 100644
--- a/content/http..www.gap-system.org/pkg/io-4.4.4/gap/iohub.omdoc
+++ b/content/http..www.gap-system.org/pkg/io-4.4.4/gap/iohub.omdoc
@@ -20,19 +20,19 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/pkg/io-4.4.4/gap" module="iohub" name="IsIOHubCat"></om:OMS>
       </om:OMA>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
        
        
-     </constant><import from="http://www.gap-system.org/pkg/io-4.4.4/gap?iohub"></import><constant name="IsIOHub">
+     </constant><constant name="IsIOHub">
        
        <type><om:OMOBJ xmlns:om="http://www.openmath.org/OpenMath"><om:OMS base="http://www.gap-system.org/" module="Types" name="filter"></om:OMS></om:OMOBJ></type>
        
@@ -46,10 +46,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/io-4.4.4/gap" module="iohub" name="IsIOHub"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/io-4.4.4/gap" module="iohub" name="IsIOHub"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -64,10 +64,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/io-4.4.4/gap" module="iohub" name="IsIOHub"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/io-4.4.4/gap" module="iohub" name="IsIOHub"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/pkg/io-4.4.4/gap" module="iohub" name="IsIOHubCat"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/pkg/io-4.4.4/gap/realrandom.omdoc b/content/http..www.gap-system.org/pkg/io-4.4.4/gap/realrandom.omdoc
index d42b460fcd84bc275c9474d7b11d957d4b4b4c4a..c21fc45c574431ac4e60133b24b67fcc1e3f2266 100644
--- a/content/http..www.gap-system.org/pkg/io-4.4.4/gap/realrandom.omdoc
+++ b/content/http..www.gap-system.org/pkg/io-4.4.4/gap/realrandom.omdoc
@@ -12,10 +12,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/io-4.4.4/gap" module="realrandom" name="IsRealRandomSource"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/io-4.4.4/gap" module="realrandom" name="IsRealRandomSource"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
@@ -30,10 +30,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/io-4.4.4/gap" module="realrandom" name="IsRealRandomSource"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/pkg/io-4.4.4/gap" module="realrandom" name="IsRealRandomSource"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
               <om:OMS base="http://www.gap-system.org/" module="Types" name="catFilter"></om:OMS><om:OMS base="http://www.gap-system.org/lib" module="random" name="IsRandomSource"></om:OMS>
       </om:OMA>
diff --git a/content/http..www.gap-system.org/prim/primitiv.omdoc b/content/http..www.gap-system.org/prim/primitiv.omdoc
index 305624d8c50376bf8e45b37baf5b2a7b90cd43c5..286d1e1be5fb04fdf16c800424798bb0858acba1 100644
--- a/content/http..www.gap-system.org/prim/primitiv.omdoc
+++ b/content/http..www.gap-system.org/prim/primitiv.omdoc
@@ -12,10 +12,10 @@
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="arrow"></om:OMS>
               <om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/prim" module="primitiv" name="IsPrimGrpIterRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/prim" module="primitiv" name="IsPrimGrpIterRep"></om:OMS>
       </om:OMA><om:OMA>
               <om:OMS base="http://cds.omdoc.org/urtheories" module="LambdaPi" name="apply"></om:OMS>
-              <om:OMS base="http://www.gap-system.org/" module="Types" name="%23"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
+              <om:OMS base="http://www.gap-system.org/" module="Types" name="hastp"></om:OMS><om:OMV name="x"></om:OMV><om:OMS base="http://www.gap-system.org/lib" module="type" name="IsComponentObjectRep"></om:OMS>
       </om:OMA>
       </om:OMA>
       </om:OMBIND></om:OMOBJ></type>
diff --git a/narration/alignment.omdoc b/narration/alignment.omdoc
new file mode 100644
index 0000000000000000000000000000000000000000..7dc625d55d49e1bc513e30d93e08ae67047ee2d7
--- /dev/null
+++ b/narration/alignment.omdoc
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<omdoc base="http://www.gap-system.org/alignment.omdoc"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/alignment.mmt#0.0.0:36.0.36"/></metadata></omdoc>
\ No newline at end of file
diff --git a/narration/draft-structure.omdoc b/narration/draft-structure.omdoc
new file mode 100644
index 0000000000000000000000000000000000000000..58d71036c1895fe2f062bc6e7ad91bde7a95c6ca
--- /dev/null
+++ b/narration/draft-structure.omdoc
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<omdoc base="http://www.gap-system.org/draft-structure.omdoc"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/draft-structure.mmt#0.0.0:1410.53.19"/></metadata></omdoc>
\ No newline at end of file
diff --git a/narration/types.omdoc b/narration/types.omdoc
index fd9ca8ffec7c1a5f530afb50caae831c58dc1769..e357025abcd34b196d4a660835a8bd1b1fc3c116 100644
--- a/narration/types.omdoc
+++ b/narration/types.omdoc
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<omdoc base="http://www.gap-system.org/types.omdoc"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#0.0.0:3017.85.1"/></metadata><mref name="[http://www.gap-system.org/?Types]" target="http://www.gap-system.org/?Types"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#85.3.0:98.3.13"/></metadata></mref></omdoc>
\ No newline at end of file
+<omdoc base="http://www.gap-system.org/types.omdoc"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#0.0.0:3040.86.0"/></metadata><mref name="[http://www.gap-system.org?Types]" target="http://www.gap-system.org?Types"><metadata><link rel="http://cds.omdoc.org/mmt?metadata?sourceRef" resource="http://www.gap-system.org/types.mmt#85.3.0:96.3.11"/></metadata></mref></omdoc>
\ No newline at end of file
diff --git a/relational/.rel b/relational/.rel
index 39aced0cf3c41522989ddbc99f8de0d15c0bec9a..1628add44f2135b952de1cfbb68302fee6cba4a7 100644
--- a/relational/.rel
+++ b/relational/.rel
@@ -1,4 +1,6 @@
 document http://www.gap-system.org
+Declares http://www.gap-system.org http://www.gap-system.org/alignment.omdoc
+Declares http://www.gap-system.org http://www.gap-system.org/draft-structure.omdoc
 Declares http://www.gap-system.org http://www.gap-system.org/grp.omdoc
 Declares http://www.gap-system.org http://www.gap-system.org/lib.omdoc
 Declares http://www.gap-system.org http://www.gap-system.org/pkg
diff --git a/relational/alignment.rel b/relational/alignment.rel
new file mode 100644
index 0000000000000000000000000000000000000000..e369eac8737c34ed234e6a2a75aba8b0b1f3c49c
--- /dev/null
+++ b/relational/alignment.rel
@@ -0,0 +1 @@
+document http://www.gap-system.org/alignment.omdoc
diff --git a/relational/draft-structure.rel b/relational/draft-structure.rel
new file mode 100644
index 0000000000000000000000000000000000000000..3ea766a079c0937513856f8958d4eded3820bcbe
--- /dev/null
+++ b/relational/draft-structure.rel
@@ -0,0 +1 @@
+document http://www.gap-system.org/draft-structure.omdoc
diff --git a/relational/gaptypes.rel b/relational/gaptypes.rel
index 456cac2baaf650762821d3f87f577050070802e9..b82b1a7b060b307aa9c92f946a10762eb34cf1de 100644
--- a/relational/gaptypes.rel
+++ b/relational/gaptypes.rel
@@ -1,8 +1,2 @@
-document http://www.gap-system.org/grp.omdoc
-Declares http://www.gap-system.org/grp.omdoc http://www.gap-system.org/grp?classic
-Declares http://www.gap-system.org/grp.omdoc http://www.gap-system.org/grp?imf
-Declares http://www.gap-system.org/grp.omdoc http://www.gap-system.org/grp?basic
-Declares http://www.gap-system.org/grp.omdoc http://www.gap-system.org/grp?perf
-Declares http://www.gap-system.org/grp.omdoc http://www.gap-system.org/grp?simple
-Declares http://www.gap-system.org/grp.omdoc http://www.gap-system.org/grp?ree
-Declares http://www.gap-system.org/grp.omdoc http://www.gap-system.org/grp?suzuki
+document http://www.gap-system.org/small.omdoc
+Declares http://www.gap-system.org/small.omdoc http://www.gap-system.org/small?small
diff --git a/relational/http..www.gap-system.org/$Types.rel b/relational/http..www.gap-system.org/$Types.rel
index 9477b1e687e0f05b21225f3feb5dfd5317350439..acacfed5a0ba496ff7e0164267493c166f98320c 100644
--- a/relational/http..www.gap-system.org/$Types.rel
+++ b/relational/http..www.gap-system.org/$Types.rel
@@ -1,54 +1,77 @@
-theory http://www.gap-system.org/?Types
-HasMeta http://www.gap-system.org/?Types http://cds.omdoc.org/urtheories?PLF
-Declares http://www.gap-system.org/?Types http://www.gap-system.org/?Types?object
-constant http://www.gap-system.org/?Types?object
-Declares http://www.gap-system.org/?Types http://www.gap-system.org/?Types?category
-constant http://www.gap-system.org/?Types?category
-Declares http://www.gap-system.org/?Types http://www.gap-system.org/?Types?filter
-constant http://www.gap-system.org/?Types?filter
-Declares http://www.gap-system.org/?Types http://www.gap-system.org/?Types?%23
-constant http://www.gap-system.org/?Types?%23
-Declares http://www.gap-system.org/?Types http://www.gap-system.org/?Types?filter_and
-constant http://www.gap-system.org/?Types?filter_and
-Declares http://www.gap-system.org/?Types http://www.gap-system.org/?Types?filter_and_hasFilter1
-constant http://www.gap-system.org/?Types?filter_and_hasFilter1
-Declares http://www.gap-system.org/?Types http://www.gap-system.org/?Types?filter_and_hasFilter2
-constant http://www.gap-system.org/?Types?filter_and_hasFilter2
-Declares http://www.gap-system.org/?Types http://www.gap-system.org/?Types?filter_and_hasFilter3
-constant http://www.gap-system.org/?Types?filter_and_hasFilter3
-Declares http://www.gap-system.org/?Types http://www.gap-system.org/?Types?ded
-constant http://www.gap-system.org/?Types?ded
-Declares http://www.gap-system.org/?Types http://www.gap-system.org/?Types?[scala://GAP.odk.mmt.kwarc.info?Booleans]
-constant http://www.gap-system.org/?Types?[scala://GAP.odk.mmt.kwarc.info?Booleans]
-Declares http://www.gap-system.org/?Types http://www.gap-system.org/?Types?[scala://GAP.odk.mmt.kwarc.info?Integers]
-constant http://www.gap-system.org/?Types?[scala://GAP.odk.mmt.kwarc.info?Integers]
-Declares http://www.gap-system.org/?Types http://www.gap-system.org/?Types?[scala://GAP.odk.mmt.kwarc.info?Floats]
-constant http://www.gap-system.org/?Types?[scala://GAP.odk.mmt.kwarc.info?Floats]
-Declares http://www.gap-system.org/?Types http://www.gap-system.org/?Types?booleans
-constant http://www.gap-system.org/?Types?booleans
-Declares http://www.gap-system.org/?Types http://www.gap-system.org/?Types?integers
-constant http://www.gap-system.org/?Types?integers
-Declares http://www.gap-system.org/?Types http://www.gap-system.org/?Types?floats
-constant http://www.gap-system.org/?Types?floats
-Declares http://www.gap-system.org/?Types http://www.gap-system.org/?Types?gapbool
-constant http://www.gap-system.org/?Types?gapbool
-Declares http://www.gap-system.org/?Types http://www.gap-system.org/?Types?gapint
-constant http://www.gap-system.org/?Types?gapint
-Declares http://www.gap-system.org/?Types http://www.gap-system.org/?Types?gapfloat
-constant http://www.gap-system.org/?Types?gapfloat
-Declares http://www.gap-system.org/?Types http://www.gap-system.org/?Types?trueI
-constant http://www.gap-system.org/?Types?trueI
-Declares http://www.gap-system.org/?Types http://www.gap-system.org/?Types?catFilter
-constant http://www.gap-system.org/?Types?catFilter
-Declares http://www.gap-system.org/?Types http://www.gap-system.org/?Types?propertyFilter
-constant http://www.gap-system.org/?Types?propertyFilter
-Declares http://www.gap-system.org/?Types http://www.gap-system.org/?Types?Has
-constant http://www.gap-system.org/?Types?Has
-Declares http://www.gap-system.org/?Types http://www.gap-system.org/?Types?CategoryCollection
-constant http://www.gap-system.org/?Types?CategoryCollection
-Declares http://www.gap-system.org/?Types http://www.gap-system.org/?Types?Set
-constant http://www.gap-system.org/?Types?Set
-Declares http://www.gap-system.org/?Types http://www.gap-system.org/?Types?IsBool
-constant http://www.gap-system.org/?Types?IsBool
-Declares http://www.gap-system.org/?Types http://www.gap-system.org/?Types?IsObject
-constant http://www.gap-system.org/?Types?IsObject
+datatypeconstructor http://www.gap-system.org?Types?object
+datatypeconstructor http://www.gap-system.org?Types?category
+datatypeconstructor http://www.gap-system.org?Types?booleans
+datatypeconstructor http://www.gap-system.org?Types?integers
+datatypeconstructor http://www.gap-system.org?Types?floats
+highuniverse http://www.gap-system.org?Types?filter
+datatypeconstructor http://www.gap-system.org?Types?hastp
+dataconstructor http://www.gap-system.org?Types?filter_and
+dataconstructor http://www.gap-system.org?Types?filter_and_hasFilter1
+dataconstructor http://www.gap-system.org?Types?filter_and_hasFilter2
+dataconstructor http://www.gap-system.org?Types?filter_and_hasFilter3
+datatypeconstructor http://www.gap-system.org?Types?ded
+dataconstructor http://www.gap-system.org?Types?gapbool
+dataconstructor http://www.gap-system.org?Types?gapint
+dataconstructor http://www.gap-system.org?Types?gapfloat
+dataconstructor http://www.gap-system.org?Types?trueI
+dataconstructor http://www.gap-system.org?Types?catFilter
+dataconstructor http://www.gap-system.org?Types?propertyFilter
+dataconstructor http://www.gap-system.org?Types?Has
+dataconstructor http://www.gap-system.org?Types?CategoryCollection
+dataconstructor http://www.gap-system.org?Types?Set
+dataconstructor http://www.gap-system.org?Types?IsBool
+dataconstructor http://www.gap-system.org?Types?IsObject
+theory http://www.gap-system.org?Types
+HasMeta http://www.gap-system.org?Types http://cds.omdoc.org/urtheories?PLF
+Declares http://www.gap-system.org?Types http://www.gap-system.org?Types?object
+constant http://www.gap-system.org?Types?object
+Declares http://www.gap-system.org?Types http://www.gap-system.org?Types?category
+constant http://www.gap-system.org?Types?category
+Declares http://www.gap-system.org?Types http://www.gap-system.org?Types?booleans
+constant http://www.gap-system.org?Types?booleans
+Declares http://www.gap-system.org?Types http://www.gap-system.org?Types?integers
+constant http://www.gap-system.org?Types?integers
+Declares http://www.gap-system.org?Types http://www.gap-system.org?Types?floats
+constant http://www.gap-system.org?Types?floats
+Declares http://www.gap-system.org?Types http://www.gap-system.org?Types?filter
+constant http://www.gap-system.org?Types?filter
+Declares http://www.gap-system.org?Types http://www.gap-system.org?Types?hastp
+constant http://www.gap-system.org?Types?hastp
+Declares http://www.gap-system.org?Types http://www.gap-system.org?Types?filter_and
+constant http://www.gap-system.org?Types?filter_and
+Declares http://www.gap-system.org?Types http://www.gap-system.org?Types?filter_and_hasFilter1
+constant http://www.gap-system.org?Types?filter_and_hasFilter1
+Declares http://www.gap-system.org?Types http://www.gap-system.org?Types?filter_and_hasFilter2
+constant http://www.gap-system.org?Types?filter_and_hasFilter2
+Declares http://www.gap-system.org?Types http://www.gap-system.org?Types?filter_and_hasFilter3
+constant http://www.gap-system.org?Types?filter_and_hasFilter3
+Declares http://www.gap-system.org?Types http://www.gap-system.org?Types?ded
+constant http://www.gap-system.org?Types?ded
+Declares http://www.gap-system.org?Types http://www.gap-system.org?Types?[scala://GAP.odk.mmt.kwarc.info?Booleans]
+constant http://www.gap-system.org?Types?[scala://GAP.odk.mmt.kwarc.info?Booleans]
+Declares http://www.gap-system.org?Types http://www.gap-system.org?Types?[scala://GAP.odk.mmt.kwarc.info?Integers]
+constant http://www.gap-system.org?Types?[scala://GAP.odk.mmt.kwarc.info?Integers]
+Declares http://www.gap-system.org?Types http://www.gap-system.org?Types?[scala://GAP.odk.mmt.kwarc.info?Floats]
+constant http://www.gap-system.org?Types?[scala://GAP.odk.mmt.kwarc.info?Floats]
+Declares http://www.gap-system.org?Types http://www.gap-system.org?Types?gapbool
+constant http://www.gap-system.org?Types?gapbool
+Declares http://www.gap-system.org?Types http://www.gap-system.org?Types?gapint
+constant http://www.gap-system.org?Types?gapint
+Declares http://www.gap-system.org?Types http://www.gap-system.org?Types?gapfloat
+constant http://www.gap-system.org?Types?gapfloat
+Declares http://www.gap-system.org?Types http://www.gap-system.org?Types?trueI
+constant http://www.gap-system.org?Types?trueI
+Declares http://www.gap-system.org?Types http://www.gap-system.org?Types?catFilter
+constant http://www.gap-system.org?Types?catFilter
+Declares http://www.gap-system.org?Types http://www.gap-system.org?Types?propertyFilter
+constant http://www.gap-system.org?Types?propertyFilter
+Declares http://www.gap-system.org?Types http://www.gap-system.org?Types?Has
+constant http://www.gap-system.org?Types?Has
+Declares http://www.gap-system.org?Types http://www.gap-system.org?Types?CategoryCollection
+constant http://www.gap-system.org?Types?CategoryCollection
+Declares http://www.gap-system.org?Types http://www.gap-system.org?Types?Set
+constant http://www.gap-system.org?Types?Set
+Declares http://www.gap-system.org?Types http://www.gap-system.org?Types?IsBool
+constant http://www.gap-system.org?Types?IsBool
+Declares http://www.gap-system.org?Types http://www.gap-system.org?Types?IsObject
+constant http://www.gap-system.org?Types?IsObject
diff --git a/relational/http..www.gap-system.org/grp/basic.rel b/relational/http..www.gap-system.org/grp/basic.rel
index 570c80dca00d9df04952a54e7639dfc77b5719f2..ec77602432984ebe0a2b7755045bb6202ee54fa7 100644
--- a/relational/http..www.gap-system.org/grp/basic.rel
+++ b/relational/http..www.gap-system.org/grp/basic.rel
@@ -41,6 +41,17 @@ IsAttribute http://www.gap-system.org/grp?basic?AlternatingGroupCons
 implies http://www.gap-system.org/grp?basic?AlternatingGroupCons http://www.gap-system.org/lib?magma?IsMagmaWithInverses
 implies http://www.gap-system.org/grp?basic?AlternatingGroupCons http://www.gap-system.org/lib?magma?IsAssociative
 implies http://www.gap-system.org/grp?basic?AlternatingGroupCons http://www.gap-system.org/lib?cyclotom?IsInt
+dataconstructor http://www.gap-system.org/grp?basic?AbelianGroupCons
+dataconstructor http://www.gap-system.org/grp?basic?QuaternionGroupCons
+dataconstructor http://www.gap-system.org/grp?basic?ExtraspecialGroupCons
+dataconstructor http://www.gap-system.org/grp?basic?CyclicGroupCons
+dataconstructor http://www.gap-system.org/grp?basic?DihedralGroupCons
+dataconstructor http://www.gap-system.org/grp?basic?FreeAbelianGroupCons
+dataconstructor http://www.gap-system.org/grp?basic?MathieuGroupCons
+dataconstructor http://www.gap-system.org/grp?basic?ElementaryAbelianGroupCons
+dataconstructor http://www.gap-system.org/grp?basic?TrivialGroupCons
+dataconstructor http://www.gap-system.org/grp?basic?SymmetricGroupCons
+dataconstructor http://www.gap-system.org/grp?basic?AlternatingGroupCons
 theory http://www.gap-system.org/grp?basic
 HasMeta http://www.gap-system.org/grp?basic http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/grp?basic http://www.gap-system.org/lib?magma
diff --git a/relational/http..www.gap-system.org/grp/classic.rel b/relational/http..www.gap-system.org/grp/classic.rel
index 03b76756dc1af749a708c4172066d41d076df570..1620133fcdd25c907cdc75f590a1d1ca5f73e8a0 100644
--- a/relational/http..www.gap-system.org/grp/classic.rel
+++ b/relational/http..www.gap-system.org/grp/classic.rel
@@ -101,6 +101,22 @@ implies http://www.gap-system.org/grp?classic?GeneralUnitaryGroupCons http://www
 implies http://www.gap-system.org/grp?classic?GeneralUnitaryGroupCons http://www.gap-system.org/lib?magma?IsAssociative
 implies http://www.gap-system.org/grp?classic?GeneralUnitaryGroupCons http://www.gap-system.org/lib?cyclotom?IsInt
 implies http://www.gap-system.org/grp?classic?GeneralUnitaryGroupCons http://www.gap-system.org/lib?cyclotom?IsPosRat
+dataconstructor http://www.gap-system.org/grp?classic?GeneralLinearGroupCons
+dataconstructor http://www.gap-system.org/grp?classic?SymplecticGroupCons
+dataconstructor http://www.gap-system.org/grp?classic?SpecialUnitaryGroupCons
+dataconstructor http://www.gap-system.org/grp?classic?ProjectiveSpecialLinearGroupCons
+dataconstructor http://www.gap-system.org/grp?classic?SpecialOrthogonalGroupCons
+dataconstructor http://www.gap-system.org/grp?classic?ProjectiveSymplecticGroupCons
+dataconstructor http://www.gap-system.org/grp?classic?ProjectiveGeneralUnitaryGroupCons
+dataconstructor http://www.gap-system.org/grp?classic?SpecialSemilinearGroupCons
+dataconstructor http://www.gap-system.org/grp?classic?SpecialLinearGroupCons
+dataconstructor http://www.gap-system.org/grp?classic?ProjectiveOmegaCons
+dataconstructor http://www.gap-system.org/grp?classic?GeneralSemilinearGroupCons
+dataconstructor http://www.gap-system.org/grp?classic?GeneralOrthogonalGroupCons
+dataconstructor http://www.gap-system.org/grp?classic?ProjectiveSpecialUnitaryGroupCons
+dataconstructor http://www.gap-system.org/grp?classic?OmegaCons
+dataconstructor http://www.gap-system.org/grp?classic?ProjectiveGeneralLinearGroupCons
+dataconstructor http://www.gap-system.org/grp?classic?GeneralUnitaryGroupCons
 theory http://www.gap-system.org/grp?classic
 HasMeta http://www.gap-system.org/grp?classic http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/grp?classic http://www.gap-system.org/lib?magma
diff --git a/relational/http..www.gap-system.org/grp/imf.rel b/relational/http..www.gap-system.org/grp/imf.rel
index 20a05e018a9a4b90f6f1759b88d50d9118e0df17..6de2b16292e59439383b4ceb26fa72bf5c713791 100644
--- a/relational/http..www.gap-system.org/grp/imf.rel
+++ b/relational/http..www.gap-system.org/grp/imf.rel
@@ -2,6 +2,8 @@ IsAttribute http://www.gap-system.org/grp?imf?ImfRecord
 implies http://www.gap-system.org/grp?imf?ImfRecord http://www.gap-system.org/lib?magma?IsMagmaWithInverses
 implies http://www.gap-system.org/grp?imf?ImfRecord http://www.gap-system.org/lib?magma?IsAssociative
 IsFilter http://www.gap-system.org/grp?imf?IsImfMatrixGroup
+dataconstructor http://www.gap-system.org/grp?imf?ImfRecord
+dataconstructor http://www.gap-system.org/grp?imf?IsImfMatrixGroup
 theory http://www.gap-system.org/grp?imf
 HasMeta http://www.gap-system.org/grp?imf http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/grp?imf http://www.gap-system.org/lib?magma
diff --git a/relational/http..www.gap-system.org/grp/perf.rel b/relational/http..www.gap-system.org/grp/perf.rel
index 1aec8ef1f8e86cf9d69372482d25b9ee7c4e72c2..89e699a7b0a9ae472a2bfa466bcf923afea739db 100644
--- a/relational/http..www.gap-system.org/grp/perf.rel
+++ b/relational/http..www.gap-system.org/grp/perf.rel
@@ -29,6 +29,44 @@ implies http://www.gap-system.org/grp?perf?PerfGrpConst http://www.gap-system.or
 IsAttribute http://www.gap-system.org/grp?perf?PerfectIdentification
 implies http://www.gap-system.org/grp?perf?PerfectIdentification http://www.gap-system.org/lib?magma?IsMagmaWithInverses
 implies http://www.gap-system.org/grp?perf?PerfectIdentification http://www.gap-system.org/lib?magma?IsAssociative
+dataconstructor http://www.gap-system.org/grp?perf?IsPerfectLibraryGroup
+dataconstructor http://www.gap-system.org/grp?perf?IsPerfectLibraryGroup_st0
+dataconstructor http://www.gap-system.org/grp?perf?IsPerfectLibraryGroup_st1
+dataconstructor http://www.gap-system.org/grp?perf?IsPerfectLibraryGroup_st2
+dataconstructor http://www.gap-system.org/grp?perf?IsPerfectLibraryGroup_st3
+dataconstructor http://www.gap-system.org/grp?perf?IsPerfectLibraryGroup_st4
+dataconstructor http://www.gap-system.org/grp?perf?IsPerfectLibraryGroup_st5
+dataconstructor http://www.gap-system.org/grp?perf?IsPerfectLibraryGroup_st6
+dataconstructor http://www.gap-system.org/grp?perf?IsPerfectLibraryGroup_st7
+dataconstructor http://www.gap-system.org/grp?perf?IsPerfectLibraryGroup_st8
+dataconstructor http://www.gap-system.org/grp?perf?IsPerfectLibraryGroup_st9
+dataconstructor http://www.gap-system.org/grp?perf?IsPerfectLibraryGroup_st10
+dataconstructor http://www.gap-system.org/grp?perf?IsPerfectLibraryGroup_st11
+dataconstructor http://www.gap-system.org/grp?perf?IsPerfectLibraryGroup_st12
+dataconstructor http://www.gap-system.org/grp?perf?IsPerfectLibraryGroup_st13
+dataconstructor http://www.gap-system.org/grp?perf?IsPerfectLibraryGroup_st14
+dataconstructor http://www.gap-system.org/grp?perf?IsPerfectLibraryGroup_st15
+dataconstructor http://www.gap-system.org/grp?perf?IsPerfectLibraryGroup_st16
+dataconstructor http://www.gap-system.org/grp?perf?IsPerfectLibraryGroup_st17
+dataconstructor http://www.gap-system.org/grp?perf?IsPerfectLibraryGroup_st18
+dataconstructor http://www.gap-system.org/grp?perf?IsPerfectLibraryGroup_st19
+dataconstructor http://www.gap-system.org/grp?perf?IsPerfectLibraryGroup_st20
+dataconstructor http://www.gap-system.org/grp?perf?IsPerfectLibraryGroup_st21
+dataconstructor http://www.gap-system.org/grp?perf?IsPerfectLibraryGroup_st22
+dataconstructor http://www.gap-system.org/grp?perf?IsPerfectLibraryGroup_st23
+dataconstructor http://www.gap-system.org/grp?perf?IsPerfectLibraryGroup_st24
+dataconstructor http://www.gap-system.org/grp?perf?IsPerfectLibraryGroup_st25
+dataconstructor http://www.gap-system.org/grp?perf?IsPerfectLibraryGroup_st26
+dataconstructor http://www.gap-system.org/grp?perf?IsPerfectLibraryGroup_st27
+dataconstructor http://www.gap-system.org/grp?perf?IsPerfectLibraryGroup_st28
+dataconstructor http://www.gap-system.org/grp?perf?IsPerfectLibraryGroup_st29
+dataconstructor http://www.gap-system.org/grp?perf?IsPerfectLibraryGroup_st30
+dataconstructor http://www.gap-system.org/grp?perf?IsPerfectLibraryGroup_st31
+dataconstructor http://www.gap-system.org/grp?perf?IsPerfectLibraryGroup_st32
+dataconstructor http://www.gap-system.org/grp?perf?IsPerfectLibraryGroup_st33
+dataconstructor http://www.gap-system.org/grp?perf?IsPerfectLibraryGroup_st34
+dataconstructor http://www.gap-system.org/grp?perf?PerfGrpConst
+dataconstructor http://www.gap-system.org/grp?perf?PerfectIdentification
 theory http://www.gap-system.org/grp?perf
 HasMeta http://www.gap-system.org/grp?perf http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/grp?perf http://www.gap-system.org/lib?coll
diff --git a/relational/http..www.gap-system.org/grp/ree.rel b/relational/http..www.gap-system.org/grp/ree.rel
index 09337989f95446a6964d93589768fe40f84539a5..a8a1d70825bd291ec337f27b697f9d193bcecb63 100644
--- a/relational/http..www.gap-system.org/grp/ree.rel
+++ b/relational/http..www.gap-system.org/grp/ree.rel
@@ -2,6 +2,7 @@ IsAttribute http://www.gap-system.org/grp?ree?ReeGroupCons
 implies http://www.gap-system.org/grp?ree?ReeGroupCons http://www.gap-system.org/lib?magma?IsMagmaWithInverses
 implies http://www.gap-system.org/grp?ree?ReeGroupCons http://www.gap-system.org/lib?magma?IsAssociative
 implies http://www.gap-system.org/grp?ree?ReeGroupCons http://www.gap-system.org/lib?cyclotom?IsInt
+dataconstructor http://www.gap-system.org/grp?ree?ReeGroupCons
 theory http://www.gap-system.org/grp?ree
 HasMeta http://www.gap-system.org/grp?ree http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/grp?ree http://www.gap-system.org/lib?magma
diff --git a/relational/http..www.gap-system.org/grp/simple.rel b/relational/http..www.gap-system.org/grp/simple.rel
index 7fd4de111f802afb0b393b64d63fbde7b8f2e7b6..1c7ba7dee2e7c08dc1816f0075b9205ffbe6ed42 100644
--- a/relational/http..www.gap-system.org/grp/simple.rel
+++ b/relational/http..www.gap-system.org/grp/simple.rel
@@ -1,6 +1,7 @@
 IsAttribute http://www.gap-system.org/grp?simple?DataAboutSimpleGroup
 implies http://www.gap-system.org/grp?simple?DataAboutSimpleGroup http://www.gap-system.org/lib?magma?IsMagmaWithInverses
 implies http://www.gap-system.org/grp?simple?DataAboutSimpleGroup http://www.gap-system.org/lib?magma?IsAssociative
+dataconstructor http://www.gap-system.org/grp?simple?DataAboutSimpleGroup
 theory http://www.gap-system.org/grp?simple
 HasMeta http://www.gap-system.org/grp?simple http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/grp?simple http://www.gap-system.org/lib?magma
diff --git a/relational/http..www.gap-system.org/grp/suzuki.rel b/relational/http..www.gap-system.org/grp/suzuki.rel
index dda5a61827b4f4d182eabed662c118c63919b08d..84eb1458715fbcaea7917721a0fa0fca33e8baf2 100644
--- a/relational/http..www.gap-system.org/grp/suzuki.rel
+++ b/relational/http..www.gap-system.org/grp/suzuki.rel
@@ -2,6 +2,7 @@ IsAttribute http://www.gap-system.org/grp?suzuki?SuzukiGroupCons
 implies http://www.gap-system.org/grp?suzuki?SuzukiGroupCons http://www.gap-system.org/lib?magma?IsMagmaWithInverses
 implies http://www.gap-system.org/grp?suzuki?SuzukiGroupCons http://www.gap-system.org/lib?magma?IsAssociative
 implies http://www.gap-system.org/grp?suzuki?SuzukiGroupCons http://www.gap-system.org/lib?cyclotom?IsInt
+dataconstructor http://www.gap-system.org/grp?suzuki?SuzukiGroupCons
 theory http://www.gap-system.org/grp?suzuki
 HasMeta http://www.gap-system.org/grp?suzuki http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/grp?suzuki http://www.gap-system.org/lib?magma
diff --git a/relational/http..www.gap-system.org/lib/addcoset.rel b/relational/http..www.gap-system.org/lib/addcoset.rel
index 89297ea2b5427d98652320b4d33fb023ea6f7812..4cfc1720c01ecc4faf11fc5d3c9d906c9eb10181 100644
--- a/relational/http..www.gap-system.org/lib/addcoset.rel
+++ b/relational/http..www.gap-system.org/lib/addcoset.rel
@@ -16,6 +16,21 @@ implies http://www.gap-system.org/lib?addcoset?AdditiveCoset http://www.gap-syst
 implies http://www.gap-system.org/lib?addcoset?AdditiveCoset http://www.gap-system.org/lib?arith?IsAdditiveElement
 IsFilter http://www.gap-system.org/lib?addcoset?IsAdditiveCosetDefaultRep
 implies http://www.gap-system.org/lib?addcoset?IsAdditiveCosetDefaultRep_st0 http://www.gap-system.org/lib?type?IsPositionalObjectRep
+dataconstructor http://www.gap-system.org/lib?addcoset?IsAdditiveCoset
+dataconstructor http://www.gap-system.org/lib?addcoset?IsAdditiveCoset_st0
+dataconstructor http://www.gap-system.org/lib?addcoset?IsAdditiveCoset_st1
+dataconstructor http://www.gap-system.org/lib?addcoset?IsAdditiveCoset_st2
+dataconstructor http://www.gap-system.org/lib?addcoset?IsAdditiveCoset_st3
+dataconstructor http://www.gap-system.org/lib?addcoset?IsAdditiveCoset_st4
+dataconstructor http://www.gap-system.org/lib?addcoset?IsAdditiveCoset_st5
+dataconstructor http://www.gap-system.org/lib?addcoset?IsAdditiveCoset_st6
+dataconstructor http://www.gap-system.org/lib?addcoset?IsAdditiveCoset_st7
+dataconstructor http://www.gap-system.org/lib?addcoset?IsAdditiveCoset_st8
+dataconstructor http://www.gap-system.org/lib?addcoset?IsAdditiveCoset_st9
+dataconstructor http://www.gap-system.org/lib?addcoset?IsAdditiveCoset_st10
+dataconstructor http://www.gap-system.org/lib?addcoset?AdditiveCoset
+dataconstructor http://www.gap-system.org/lib?addcoset?IsAdditiveCosetDefaultRep
+dataconstructor http://www.gap-system.org/lib?addcoset?IsAdditiveCosetDefaultRep_st0
 theory http://www.gap-system.org/lib?addcoset
 HasMeta http://www.gap-system.org/lib?addcoset http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?addcoset http://www.gap-system.org/lib?coll
diff --git a/relational/http..www.gap-system.org/lib/addmagma.rel b/relational/http..www.gap-system.org/lib/addmagma.rel
index c2eec8cffc9c37e28255f1aac1bcd5336f086805..5e43f019ccf9a34d3b6fdcdaf31f503ffaca5e11 100644
--- a/relational/http..www.gap-system.org/lib/addmagma.rel
+++ b/relational/http..www.gap-system.org/lib/addmagma.rel
@@ -57,6 +57,52 @@ IsFilter http://www.gap-system.org/lib?addmagma?IsAdditiveMagmaWithZero
 implies http://www.gap-system.org/lib?addmagma?IsAdditiveMagmaWithZero http://www.gap-system.org/lib?addmagma?IsNearAdditiveMagma
 implies http://www.gap-system.org/lib?addmagma?IsAdditiveMagmaWithZero http://www.gap-system.org/lib?addmagma?IsNearAdditiveMagmaWithZero
 implies http://www.gap-system.org/lib?addmagma?IsAdditiveMagmaWithZero http://www.gap-system.org/lib?addmagma?IsAdditivelyCommutative
+dataconstructor http://www.gap-system.org/lib?addmagma?IsNearAdditiveMagma
+dataconstructor http://www.gap-system.org/lib?addmagma?IsNearAdditiveMagma_st0
+dataconstructor http://www.gap-system.org/lib?addmagma?IsNearAdditiveMagma_st1
+dataconstructor http://www.gap-system.org/lib?addmagma?IsNearAdditiveMagma_st2
+dataconstructor http://www.gap-system.org/lib?addmagma?IsNearAdditiveMagma_st3
+dataconstructor http://www.gap-system.org/lib?addmagma?IsNearAdditiveMagma_st4
+dataconstructor http://www.gap-system.org/lib?addmagma?IsNearAdditiveMagma_st5
+dataconstructor http://www.gap-system.org/lib?addmagma?IsNearAdditiveMagma_st6
+dataconstructor http://www.gap-system.org/lib?addmagma?IsNearAdditiveMagma_st7
+dataconstructor http://www.gap-system.org/lib?addmagma?IsNearAdditiveMagmaWithZero
+dataconstructor http://www.gap-system.org/lib?addmagma?IsNearAdditiveMagmaWithZero_st0
+dataconstructor http://www.gap-system.org/lib?addmagma?IsNearAdditiveMagmaWithZero_st1
+dataconstructor http://www.gap-system.org/lib?addmagma?IsNearAdditiveMagmaWithZero_st2
+dataconstructor http://www.gap-system.org/lib?addmagma?IsNearAdditiveMagmaWithZero_st3
+dataconstructor http://www.gap-system.org/lib?addmagma?IsNearAdditiveMagmaWithZero_st4
+dataconstructor http://www.gap-system.org/lib?addmagma?IsNearAdditiveMagmaWithZero_st5
+dataconstructor http://www.gap-system.org/lib?addmagma?IsNearAdditiveMagmaWithZero_st6
+dataconstructor http://www.gap-system.org/lib?addmagma?IsNearAdditiveMagmaWithZero_st7
+dataconstructor http://www.gap-system.org/lib?addmagma?IsNearAdditiveMagmaWithZero_st8
+dataconstructor http://www.gap-system.org/lib?addmagma?IsNearAdditiveMagmaWithZero_st9
+dataconstructor http://www.gap-system.org/lib?addmagma?IsNearAdditiveGroup
+dataconstructor http://www.gap-system.org/lib?addmagma?IsNearAdditiveGroup_st0
+dataconstructor http://www.gap-system.org/lib?addmagma?IsNearAdditiveGroup_st1
+dataconstructor http://www.gap-system.org/lib?addmagma?IsNearAdditiveGroup_st2
+dataconstructor http://www.gap-system.org/lib?addmagma?IsNearAdditiveGroup_st3
+dataconstructor http://www.gap-system.org/lib?addmagma?IsNearAdditiveGroup_st4
+dataconstructor http://www.gap-system.org/lib?addmagma?IsNearAdditiveGroup_st5
+dataconstructor http://www.gap-system.org/lib?addmagma?IsNearAdditiveGroup_st6
+dataconstructor http://www.gap-system.org/lib?addmagma?IsNearAdditiveGroup_st7
+dataconstructor http://www.gap-system.org/lib?addmagma?IsNearAdditiveGroup_st8
+dataconstructor http://www.gap-system.org/lib?addmagma?IsNearAdditiveGroup_st9
+dataconstructor http://www.gap-system.org/lib?addmagma?IsNearAdditiveGroup_st10
+dataconstructor http://www.gap-system.org/lib?addmagma?IsNearAdditiveGroup_st11
+dataconstructor http://www.gap-system.org/lib?addmagma?IsAdditivelyCommutative
+dataconstructor http://www.gap-system.org/lib?addmagma?NearAdditiveMagmaWithZeroByGenerators
+dataconstructor http://www.gap-system.org/lib?addmagma?NearAdditiveGroupByGenerators
+dataconstructor http://www.gap-system.org/lib?addmagma?AdditiveNeutralElement
+dataconstructor http://www.gap-system.org/lib?addmagma?GeneratorsOfNearAdditiveMagmaWithZero
+dataconstructor http://www.gap-system.org/lib?addmagma?IsAdditiveMagma
+dataconstructor http://www.gap-system.org/lib?addmagma?TrivialSubnearAdditiveMagmaWithZero
+dataconstructor http://www.gap-system.org/lib?addmagma?IsAdditiveGroup
+dataconstructor http://www.gap-system.org/lib?addmagma?GeneratorsOfNearAdditiveGroup
+dataconstructor http://www.gap-system.org/lib?addmagma?GeneratorsOfNearAdditiveMagma
+dataconstructor http://www.gap-system.org/lib?addmagma?NearAdditiveMagmaByGenerators
+dataconstructor http://www.gap-system.org/lib?addmagma?ClosureNearAdditiveGroup
+dataconstructor http://www.gap-system.org/lib?addmagma?IsAdditiveMagmaWithZero
 theory http://www.gap-system.org/lib?addmagma
 HasMeta http://www.gap-system.org/lib?addmagma http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?addmagma http://www.gap-system.org/lib?coll
@@ -81,7 +127,6 @@ Declares http://www.gap-system.org/lib?addmagma http://www.gap-system.org/lib?ad
 constant http://www.gap-system.org/lib?addmagma?IsNearAdditiveMagma_st6
 Declares http://www.gap-system.org/lib?addmagma http://www.gap-system.org/lib?addmagma?IsNearAdditiveMagma_st7
 constant http://www.gap-system.org/lib?addmagma?IsNearAdditiveMagma_st7
-Includes http://www.gap-system.org/lib?addmagma http://www.gap-system.org/lib?addmagma
 Declares http://www.gap-system.org/lib?addmagma http://www.gap-system.org/lib?addmagma?IsNearAdditiveMagmaWithZero
 constant http://www.gap-system.org/lib?addmagma?IsNearAdditiveMagmaWithZero
 Declares http://www.gap-system.org/lib?addmagma http://www.gap-system.org/lib?addmagma?IsNearAdditiveMagmaWithZero_st0
diff --git a/relational/http..www.gap-system.org/lib/adjoin.rel b/relational/http..www.gap-system.org/lib/adjoin.rel
index 5e86a2d3e94168954044bd195bfd46e1895864ed..6b60776e4aee3ed194e3eb65a18576ed9c51e885 100644
--- a/relational/http..www.gap-system.org/lib/adjoin.rel
+++ b/relational/http..www.gap-system.org/lib/adjoin.rel
@@ -37,6 +37,42 @@ IsAttribute http://www.gap-system.org/lib?adjoin?AdjoinedIdentityDefaultType
 implies http://www.gap-system.org/lib?adjoin?AdjoinedIdentityDefaultType http://www.gap-system.org/lib?type?IsFamily
 IsFilter http://www.gap-system.org/lib?adjoin?IsMonoidByAdjoiningIdentityEltRep
 implies http://www.gap-system.org/lib?adjoin?IsMonoidByAdjoiningIdentityEltRep_st0 http://www.gap-system.org/lib?type?IsPositionalObjectRep
+dataconstructor http://www.gap-system.org/lib?adjoin?IsMonoidByAdjoiningIdentityElt
+dataconstructor http://www.gap-system.org/lib?adjoin?IsMonoidByAdjoiningIdentityElt_st0
+dataconstructor http://www.gap-system.org/lib?adjoin?IsMonoidByAdjoiningIdentityElt_st1
+dataconstructor http://www.gap-system.org/lib?adjoin?IsMonoidByAdjoiningIdentityElt_st2
+dataconstructor http://www.gap-system.org/lib?adjoin?IsMonoidByAdjoiningIdentityElt_st3
+dataconstructor http://www.gap-system.org/lib?adjoin?IsMonoidByAdjoiningIdentityElt_st4
+dataconstructor http://www.gap-system.org/lib?adjoin?UnderlyingSemigroupElementOfMonoidByAdjoiningIdentityElt
+dataconstructor http://www.gap-system.org/lib?adjoin?UnderlyingSemigroupFamily
+dataconstructor http://www.gap-system.org/lib?adjoin?MonoidByAdjoiningIdentityElt
+dataconstructor http://www.gap-system.org/lib?adjoin?AdjoinedIdentityFamily
+dataconstructor http://www.gap-system.org/lib?adjoin?MonoidByAdjoiningIdentity
+dataconstructor http://www.gap-system.org/lib?adjoin?IsMonoidByAdjoiningIdentity
+dataconstructor http://www.gap-system.org/lib?adjoin?IsMonoidByAdjoiningIdentity_st0
+dataconstructor http://www.gap-system.org/lib?adjoin?IsMonoidByAdjoiningIdentity_st1
+dataconstructor http://www.gap-system.org/lib?adjoin?IsMonoidByAdjoiningIdentity_st2
+dataconstructor http://www.gap-system.org/lib?adjoin?IsMonoidByAdjoiningIdentity_st3
+dataconstructor http://www.gap-system.org/lib?adjoin?IsMonoidByAdjoiningIdentity_st4
+dataconstructor http://www.gap-system.org/lib?adjoin?IsMonoidByAdjoiningIdentity_st5
+dataconstructor http://www.gap-system.org/lib?adjoin?IsMonoidByAdjoiningIdentity_st6
+dataconstructor http://www.gap-system.org/lib?adjoin?IsMonoidByAdjoiningIdentity_st7
+dataconstructor http://www.gap-system.org/lib?adjoin?IsMonoidByAdjoiningIdentity_st8
+dataconstructor http://www.gap-system.org/lib?adjoin?IsMonoidByAdjoiningIdentity_st9
+dataconstructor http://www.gap-system.org/lib?adjoin?IsMonoidByAdjoiningIdentity_st10
+dataconstructor http://www.gap-system.org/lib?adjoin?IsMonoidByAdjoiningIdentity_st11
+dataconstructor http://www.gap-system.org/lib?adjoin?IsMonoidByAdjoiningIdentity_st12
+dataconstructor http://www.gap-system.org/lib?adjoin?IsMonoidByAdjoiningIdentity_st13
+dataconstructor http://www.gap-system.org/lib?adjoin?IsMonoidByAdjoiningIdentity_st14
+dataconstructor http://www.gap-system.org/lib?adjoin?IsMonoidByAdjoiningIdentity_st15
+dataconstructor http://www.gap-system.org/lib?adjoin?IsMonoidByAdjoiningIdentity_st16
+dataconstructor http://www.gap-system.org/lib?adjoin?IsMonoidByAdjoiningIdentity_st17
+dataconstructor http://www.gap-system.org/lib?adjoin?IsMonoidByAdjoiningIdentity_st18
+dataconstructor http://www.gap-system.org/lib?adjoin?IsMonoidByAdjoiningIdentity_st19
+dataconstructor http://www.gap-system.org/lib?adjoin?UnderlyingSemigroupOfMonoidByAdjoiningIdentity
+dataconstructor http://www.gap-system.org/lib?adjoin?AdjoinedIdentityDefaultType
+dataconstructor http://www.gap-system.org/lib?adjoin?IsMonoidByAdjoiningIdentityEltRep
+dataconstructor http://www.gap-system.org/lib?adjoin?IsMonoidByAdjoiningIdentityEltRep_st0
 theory http://www.gap-system.org/lib?adjoin
 HasMeta http://www.gap-system.org/lib?adjoin http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?adjoin http://www.gap-system.org/lib?arith
@@ -52,7 +88,6 @@ Declares http://www.gap-system.org/lib?adjoin http://www.gap-system.org/lib?adjo
 constant http://www.gap-system.org/lib?adjoin?IsMonoidByAdjoiningIdentityElt_st3
 Declares http://www.gap-system.org/lib?adjoin http://www.gap-system.org/lib?adjoin?IsMonoidByAdjoiningIdentityElt_st4
 constant http://www.gap-system.org/lib?adjoin?IsMonoidByAdjoiningIdentityElt_st4
-Includes http://www.gap-system.org/lib?adjoin http://www.gap-system.org/lib?adjoin
 Declares http://www.gap-system.org/lib?adjoin http://www.gap-system.org/lib?adjoin?UnderlyingSemigroupElementOfMonoidByAdjoiningIdentityElt
 constant http://www.gap-system.org/lib?adjoin?UnderlyingSemigroupElementOfMonoidByAdjoiningIdentityElt
 Includes http://www.gap-system.org/lib?adjoin http://www.gap-system.org/lib?type
diff --git a/relational/http..www.gap-system.org/lib/algebra.rel b/relational/http..www.gap-system.org/lib/algebra.rel
index 433b25296c2d4e0399ef26fb98a284c7fdf65fc5..dc2432e867c884dcc751b4109ceeb8e86aea5caa 100644
--- a/relational/http..www.gap-system.org/lib/algebra.rel
+++ b/relational/http..www.gap-system.org/lib/algebra.rel
@@ -339,6 +339,48 @@ implies http://www.gap-system.org/lib?algebra?AsLieAlgebra http://www.gap-system
 implies http://www.gap-system.org/lib?algebra?AsLieAlgebra http://www.gap-system.org/lib?semiring?IsRDistributive
 implies http://www.gap-system.org/lib?algebra?AsLieAlgebra http://www.gap-system.org/lib?ring?IsEuclideanRing
 implies http://www.gap-system.org/lib?algebra?AsLieAlgebra http://www.gap-system.org/lib?coll?IsCollection
+dataconstructor http://www.gap-system.org/lib?algebra?AsFLMLOR
+dataconstructor http://www.gap-system.org/lib?algebra?AsSubFLMLORWithOne
+dataconstructor http://www.gap-system.org/lib?algebra?IndicesOfAdjointBasis
+dataconstructor http://www.gap-system.org/lib?algebra?IsQuaternion
+dataconstructor http://www.gap-system.org/lib?algebra?IsQuaternion_st0
+dataconstructor http://www.gap-system.org/lib?algebra?IsQuaternion_st1
+dataconstructor http://www.gap-system.org/lib?algebra?IsQuaternion_st2
+dataconstructor http://www.gap-system.org/lib?algebra?IsQuaternion_st3
+dataconstructor http://www.gap-system.org/lib?algebra?IsQuaternion_st4
+dataconstructor http://www.gap-system.org/lib?algebra?IsQuaternion_st5
+dataconstructor http://www.gap-system.org/lib?algebra?IsQuaternion_st6
+dataconstructor http://www.gap-system.org/lib?algebra?IsQuaternion_st7
+dataconstructor http://www.gap-system.org/lib?algebra?IsQuaternion_st8
+dataconstructor http://www.gap-system.org/lib?algebra?IsQuaternion_st9
+dataconstructor http://www.gap-system.org/lib?algebra?IsQuaternion_st10
+dataconstructor http://www.gap-system.org/lib?algebra?IsQuaternion_st11
+dataconstructor http://www.gap-system.org/lib?algebra?IsMatrixFLMLOR
+dataconstructor http://www.gap-system.org/lib?algebra?IsFLMLOR
+dataconstructor http://www.gap-system.org/lib?algebra?ProductSpace
+dataconstructor http://www.gap-system.org/lib?algebra?NullAlgebra
+dataconstructor http://www.gap-system.org/lib?algebra?IsAlgebraWithOne
+dataconstructor http://www.gap-system.org/lib?algebra?RadicalOfAlgebra
+dataconstructor http://www.gap-system.org/lib?algebra?IsNilpotentElement
+dataconstructor http://www.gap-system.org/lib?algebra?PowerSubalgebraSeries
+dataconstructor http://www.gap-system.org/lib?algebra?LeviMalcevDecomposition
+dataconstructor http://www.gap-system.org/lib?algebra?AsFLMLORWithOne
+dataconstructor http://www.gap-system.org/lib?algebra?FLMLORWithOneByGenerators
+dataconstructor http://www.gap-system.org/lib?algebra?DirectSumOfAlgebras
+dataconstructor http://www.gap-system.org/lib?algebra?ClosureLeftOperatorRing
+dataconstructor http://www.gap-system.org/lib?algebra?GeneratorsOfLeftOperatorRing
+dataconstructor http://www.gap-system.org/lib?algebra?IsFLMLORWithOne
+dataconstructor http://www.gap-system.org/lib?algebra?FLMLORByGenerators
+dataconstructor http://www.gap-system.org/lib?algebra?IsAlgebra
+dataconstructor http://www.gap-system.org/lib?algebra?GeneratorsOfLeftOperatorRingWithOne
+dataconstructor http://www.gap-system.org/lib?algebra?IsLieAlgebra
+dataconstructor http://www.gap-system.org/lib?algebra?Grading
+dataconstructor http://www.gap-system.org/lib?algebra?AsSubFLMLOR
+dataconstructor http://www.gap-system.org/lib?algebra?AdjointBasis
+dataconstructor http://www.gap-system.org/lib?algebra?DirectSumDecomposition
+dataconstructor http://www.gap-system.org/lib?algebra?IsSimpleAlgebra
+dataconstructor http://www.gap-system.org/lib?algebra?LieAlgebraByDomain
+dataconstructor http://www.gap-system.org/lib?algebra?AsLieAlgebra
 theory http://www.gap-system.org/lib?algebra
 HasMeta http://www.gap-system.org/lib?algebra http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?algebra http://www.gap-system.org/lib?magma
diff --git a/relational/http..www.gap-system.org/lib/algfld.rel b/relational/http..www.gap-system.org/lib/algfld.rel
index c159bb80f7ea22dd88d3959efbb2808adb6715ae..3ad97c91959c24325f9b8c009faa3170f6e8d344 100644
--- a/relational/http..www.gap-system.org/lib/algfld.rel
+++ b/relational/http..www.gap-system.org/lib/algfld.rel
@@ -197,6 +197,185 @@ implies http://www.gap-system.org/lib?algfld?IsCanonicalBasisAlgebraicExtension_
 IsAttribute http://www.gap-system.org/lib?algfld?AlgebraicElementsFamilies
 implies http://www.gap-system.org/lib?algfld?AlgebraicElementsFamilies http://www.gap-system.org/lib?ratfun?IsPolynomial
 implies http://www.gap-system.org/lib?algfld?AlgebraicElementsFamilies http://www.gap-system.org/lib?ratfun?IsUnivariateRationalFunction
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st0
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st1
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st2
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st3
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st4
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st5
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st6
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st7
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st8
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st9
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st10
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st11
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st12
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st13
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st14
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st15
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st16
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st17
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st18
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st19
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st20
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st21
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st22
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st23
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st24
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st25
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st26
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st27
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st28
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st29
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st30
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st31
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st32
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st33
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st34
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st35
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st36
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st37
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st38
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st39
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st40
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st41
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st42
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st43
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st44
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st45
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st46
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st47
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st48
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st49
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st50
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st51
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st52
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st53
+dataconstructor http://www.gap-system.org/lib?algfld?DefectApproximation
+dataconstructor http://www.gap-system.org/lib?algfld?AlgebraicExtension
+dataconstructor http://www.gap-system.org/lib?algfld?AlgebraicElementsFamily
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st0
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st1
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st2
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st3
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st4
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st5
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st6
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st7
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st8
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st9
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st10
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st11
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st12
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st13
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st14
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st15
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st16
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st17
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st18
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st19
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st20
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st21
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st22
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st23
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st24
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st25
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st26
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st27
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st28
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st29
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st30
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st31
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st32
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st33
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st34
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st35
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st36
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st37
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st38
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st39
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st40
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st41
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st42
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st43
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st44
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st45
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st46
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st47
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st48
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st49
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st50
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st51
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st52
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st53
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st54
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st55
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicExtensionDefaultRep_st56
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicElement
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicElement_st0
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicElement_st1
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicElement_st2
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicElement_st3
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicElement_st4
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicElement_st5
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicElement_st6
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicElement_st7
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicElement_st8
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicElement_st9
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicElement_st10
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicElement_st11
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicElement_st12
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgebraicElement_st13
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgBFRep
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgBFRep_st0
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgBFRep_st1
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgBFRep_st2
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgBFRep_st3
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgBFRep_st4
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgBFRep_st5
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgBFRep_st6
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgBFRep_st7
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgBFRep_st8
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgBFRep_st9
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgBFRep_st10
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgBFRep_st11
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgBFRep_st12
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgBFRep_st13
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgBFRep_st14
+dataconstructor http://www.gap-system.org/lib?algfld?IsAlgBFRep_st15
+dataconstructor http://www.gap-system.org/lib?algfld?MaxNumeratorCoeffAlgElm
+dataconstructor http://www.gap-system.org/lib?algfld?IsKroneckerConstRep
+dataconstructor http://www.gap-system.org/lib?algfld?IsKroneckerConstRep_st0
+dataconstructor http://www.gap-system.org/lib?algfld?IsKroneckerConstRep_st1
+dataconstructor http://www.gap-system.org/lib?algfld?IsKroneckerConstRep_st2
+dataconstructor http://www.gap-system.org/lib?algfld?IsKroneckerConstRep_st3
+dataconstructor http://www.gap-system.org/lib?algfld?IsKroneckerConstRep_st4
+dataconstructor http://www.gap-system.org/lib?algfld?IsKroneckerConstRep_st5
+dataconstructor http://www.gap-system.org/lib?algfld?IsKroneckerConstRep_st6
+dataconstructor http://www.gap-system.org/lib?algfld?IsKroneckerConstRep_st7
+dataconstructor http://www.gap-system.org/lib?algfld?IsKroneckerConstRep_st8
+dataconstructor http://www.gap-system.org/lib?algfld?IsKroneckerConstRep_st9
+dataconstructor http://www.gap-system.org/lib?algfld?IsKroneckerConstRep_st10
+dataconstructor http://www.gap-system.org/lib?algfld?IsKroneckerConstRep_st11
+dataconstructor http://www.gap-system.org/lib?algfld?IsKroneckerConstRep_st12
+dataconstructor http://www.gap-system.org/lib?algfld?IsKroneckerConstRep_st13
+dataconstructor http://www.gap-system.org/lib?algfld?IsKroneckerConstRep_st14
+dataconstructor http://www.gap-system.org/lib?algfld?IsKroneckerConstRep_st15
+dataconstructor http://www.gap-system.org/lib?algfld?IsCanonicalBasisAlgebraicExtension
+dataconstructor http://www.gap-system.org/lib?algfld?IsCanonicalBasisAlgebraicExtension_st0
+dataconstructor http://www.gap-system.org/lib?algfld?IsCanonicalBasisAlgebraicExtension_st1
+dataconstructor http://www.gap-system.org/lib?algfld?IsCanonicalBasisAlgebraicExtension_st2
+dataconstructor http://www.gap-system.org/lib?algfld?IsCanonicalBasisAlgebraicExtension_st3
+dataconstructor http://www.gap-system.org/lib?algfld?IsCanonicalBasisAlgebraicExtension_st4
+dataconstructor http://www.gap-system.org/lib?algfld?IsCanonicalBasisAlgebraicExtension_st5
+dataconstructor http://www.gap-system.org/lib?algfld?IsCanonicalBasisAlgebraicExtension_st6
+dataconstructor http://www.gap-system.org/lib?algfld?IsCanonicalBasisAlgebraicExtension_st7
+dataconstructor http://www.gap-system.org/lib?algfld?IsCanonicalBasisAlgebraicExtension_st8
+dataconstructor http://www.gap-system.org/lib?algfld?IsCanonicalBasisAlgebraicExtension_st9
+dataconstructor http://www.gap-system.org/lib?algfld?IsCanonicalBasisAlgebraicExtension_st10
+dataconstructor http://www.gap-system.org/lib?algfld?AlgebraicElementsFamilies
 theory http://www.gap-system.org/lib?algfld
 HasMeta http://www.gap-system.org/lib?algfld http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?algfld http://www.gap-system.org/lib?coll
@@ -320,7 +499,6 @@ Declares http://www.gap-system.org/lib?algfld http://www.gap-system.org/lib?algf
 constant http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st52
 Declares http://www.gap-system.org/lib?algfld http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st53
 constant http://www.gap-system.org/lib?algfld?IsAlgebraicExtension_st53
-Includes http://www.gap-system.org/lib?algfld http://www.gap-system.org/lib?algfld
 Declares http://www.gap-system.org/lib?algfld http://www.gap-system.org/lib?algfld?DefectApproximation
 constant http://www.gap-system.org/lib?algfld?DefectApproximation
 Includes http://www.gap-system.org/lib?algfld http://www.gap-system.org/lib?ratfun
diff --git a/relational/http..www.gap-system.org/lib/algfp.rel b/relational/http..www.gap-system.org/lib/algfp.rel
index cdc1c25a11fc9c937cc8994a4ef84978af97cee8..b5522bd22ce5b5bd581929c423cee98c5bddc7b5 100644
--- a/relational/http..www.gap-system.org/lib/algfp.rel
+++ b/relational/http..www.gap-system.org/lib/algfp.rel
@@ -94,6 +94,88 @@ implies http://www.gap-system.org/lib?algfp?MappedExpression http://www.gap-syst
 IsAttribute http://www.gap-system.org/lib?algfp?RelatorsOfFpAlgebra
 implies http://www.gap-system.org/lib?algfp?RelatorsOfFpAlgebra http://www.gap-system.org/lib?algfp?IsSubalgebraFpAlgebra
 implies http://www.gap-system.org/lib?algfp?RelatorsOfFpAlgebra http://www.gap-system.org/lib?algfp?IsFullFpAlgebra
+dataconstructor http://www.gap-system.org/lib?algfp?IsNormalForm
+dataconstructor http://www.gap-system.org/lib?algfp?IsFpAlgebraElementsSpace
+dataconstructor http://www.gap-system.org/lib?algfp?IsFpAlgebraElementsSpace_st0
+dataconstructor http://www.gap-system.org/lib?algfp?IsFpAlgebraElementsSpace_st1
+dataconstructor http://www.gap-system.org/lib?algfp?IsFpAlgebraElementsSpace_st2
+dataconstructor http://www.gap-system.org/lib?algfp?IsFpAlgebraElementsSpace_st3
+dataconstructor http://www.gap-system.org/lib?algfp?IsFpAlgebraElementsSpace_st4
+dataconstructor http://www.gap-system.org/lib?algfp?IsFpAlgebraElementsSpace_st5
+dataconstructor http://www.gap-system.org/lib?algfp?IsFpAlgebraElementsSpace_st6
+dataconstructor http://www.gap-system.org/lib?algfp?IsFpAlgebraElementsSpace_st7
+dataconstructor http://www.gap-system.org/lib?algfp?IsFpAlgebraElementsSpace_st8
+dataconstructor http://www.gap-system.org/lib?algfp?IsFpAlgebraElementsSpace_st9
+dataconstructor http://www.gap-system.org/lib?algfp?IsFpAlgebraElementsSpace_st10
+dataconstructor http://www.gap-system.org/lib?algfp?IsFpAlgebraElementsSpace_st11
+dataconstructor http://www.gap-system.org/lib?algfp?IsFpAlgebraElementsSpace_st12
+dataconstructor http://www.gap-system.org/lib?algfp?IsFpAlgebraElementsSpace_st13
+dataconstructor http://www.gap-system.org/lib?algfp?IsFpAlgebraElementsSpace_st14
+dataconstructor http://www.gap-system.org/lib?algfp?IsFpAlgebraElementsSpace_st15
+dataconstructor http://www.gap-system.org/lib?algfp?IsFpAlgebraElementsSpace_st16
+dataconstructor http://www.gap-system.org/lib?algfp?IsFpAlgebraElementsSpace_st17
+dataconstructor http://www.gap-system.org/lib?algfp?IsFpAlgebraElementsSpace_st18
+dataconstructor http://www.gap-system.org/lib?algfp?IsFpAlgebraElementsSpace_st19
+dataconstructor http://www.gap-system.org/lib?algfp?IsFpAlgebraElementsSpace_st20
+dataconstructor http://www.gap-system.org/lib?algfp?IsFpAlgebraElementsSpace_st21
+dataconstructor http://www.gap-system.org/lib?algfp?IsFpAlgebraElementsSpace_st22
+dataconstructor http://www.gap-system.org/lib?algfp?IsFpAlgebraElementsSpace_st23
+dataconstructor http://www.gap-system.org/lib?algfp?IsFpAlgebraElementsSpace_st24
+dataconstructor http://www.gap-system.org/lib?algfp?IsFpAlgebraElementsSpace_st25
+dataconstructor http://www.gap-system.org/lib?algfp?IsElementOfFpAlgebra
+dataconstructor http://www.gap-system.org/lib?algfp?IsElementOfFpAlgebra_st0
+dataconstructor http://www.gap-system.org/lib?algfp?IsElementOfFpAlgebra_st1
+dataconstructor http://www.gap-system.org/lib?algfp?IsElementOfFpAlgebra_st2
+dataconstructor http://www.gap-system.org/lib?algfp?IsElementOfFpAlgebra_st3
+dataconstructor http://www.gap-system.org/lib?algfp?IsElementOfFpAlgebra_st4
+dataconstructor http://www.gap-system.org/lib?algfp?IsElementOfFpAlgebra_st5
+dataconstructor http://www.gap-system.org/lib?algfp?IsElementOfFpAlgebra_st6
+dataconstructor http://www.gap-system.org/lib?algfp?IsElementOfFpAlgebra_st7
+dataconstructor http://www.gap-system.org/lib?algfp?NiceNormalFormByExtRepFunction
+dataconstructor http://www.gap-system.org/lib?algfp?IsSubalgebraFpAlgebra
+dataconstructor http://www.gap-system.org/lib?algfp?IsSubalgebraFpAlgebra_st0
+dataconstructor http://www.gap-system.org/lib?algfp?IsSubalgebraFpAlgebra_st1
+dataconstructor http://www.gap-system.org/lib?algfp?IsSubalgebraFpAlgebra_st2
+dataconstructor http://www.gap-system.org/lib?algfp?IsSubalgebraFpAlgebra_st3
+dataconstructor http://www.gap-system.org/lib?algfp?IsSubalgebraFpAlgebra_st4
+dataconstructor http://www.gap-system.org/lib?algfp?IsSubalgebraFpAlgebra_st5
+dataconstructor http://www.gap-system.org/lib?algfp?IsSubalgebraFpAlgebra_st6
+dataconstructor http://www.gap-system.org/lib?algfp?IsSubalgebraFpAlgebra_st7
+dataconstructor http://www.gap-system.org/lib?algfp?IsSubalgebraFpAlgebra_st8
+dataconstructor http://www.gap-system.org/lib?algfp?IsSubalgebraFpAlgebra_st9
+dataconstructor http://www.gap-system.org/lib?algfp?IsSubalgebraFpAlgebra_st10
+dataconstructor http://www.gap-system.org/lib?algfp?IsSubalgebraFpAlgebra_st11
+dataconstructor http://www.gap-system.org/lib?algfp?IsSubalgebraFpAlgebra_st12
+dataconstructor http://www.gap-system.org/lib?algfp?IsSubalgebraFpAlgebra_st13
+dataconstructor http://www.gap-system.org/lib?algfp?IsSubalgebraFpAlgebra_st14
+dataconstructor http://www.gap-system.org/lib?algfp?IsSubalgebraFpAlgebra_st15
+dataconstructor http://www.gap-system.org/lib?algfp?IsSubalgebraFpAlgebra_st16
+dataconstructor http://www.gap-system.org/lib?algfp?IsSubalgebraFpAlgebra_st17
+dataconstructor http://www.gap-system.org/lib?algfp?IsSubalgebraFpAlgebra_st18
+dataconstructor http://www.gap-system.org/lib?algfp?IsSubalgebraFpAlgebra_st19
+dataconstructor http://www.gap-system.org/lib?algfp?IsSubalgebraFpAlgebra_st20
+dataconstructor http://www.gap-system.org/lib?algfp?IsSubalgebraFpAlgebra_st21
+dataconstructor http://www.gap-system.org/lib?algfp?IsSubalgebraFpAlgebra_st22
+dataconstructor http://www.gap-system.org/lib?algfp?IsSubalgebraFpAlgebra_st23
+dataconstructor http://www.gap-system.org/lib?algfp?IsSubalgebraFpAlgebra_st24
+dataconstructor http://www.gap-system.org/lib?algfp?IsSubalgebraFpAlgebra_st25
+dataconstructor http://www.gap-system.org/lib?algfp?IsSubalgebraFpAlgebra_st26
+dataconstructor http://www.gap-system.org/lib?algfp?IsSubalgebraFpAlgebra_st27
+dataconstructor http://www.gap-system.org/lib?algfp?IsSubalgebraFpAlgebra_st28
+dataconstructor http://www.gap-system.org/lib?algfp?IsSubalgebraFpAlgebra_st29
+dataconstructor http://www.gap-system.org/lib?algfp?IsSubalgebraFpAlgebra_st30
+dataconstructor http://www.gap-system.org/lib?algfp?IsSubalgebraFpAlgebra_st31
+dataconstructor http://www.gap-system.org/lib?algfp?IsSubalgebraFpAlgebra_st32
+dataconstructor http://www.gap-system.org/lib?algfp?IsSubalgebraFpAlgebra_st33
+dataconstructor http://www.gap-system.org/lib?algfp?IsSubalgebraFpAlgebra_st34
+dataconstructor http://www.gap-system.org/lib?algfp?IsSubalgebraFpAlgebra_st35
+dataconstructor http://www.gap-system.org/lib?algfp?IsFullFpAlgebra
+dataconstructor http://www.gap-system.org/lib?algfp?FreeAlgebraOfFpAlgebra
+dataconstructor http://www.gap-system.org/lib?algfp?ElementOfFpAlgebra
+dataconstructor http://www.gap-system.org/lib?algfp?FreeGeneratorsOfFpAlgebra
+dataconstructor http://www.gap-system.org/lib?algfp?NiceAlgebraMonomorphism
+dataconstructor http://www.gap-system.org/lib?algfp?MappedExpression
+dataconstructor http://www.gap-system.org/lib?algfp?RelatorsOfFpAlgebra
 theory http://www.gap-system.org/lib?algfp
 HasMeta http://www.gap-system.org/lib?algfp http://www.gap-system.org/?Types
 Declares http://www.gap-system.org/lib?algfp http://www.gap-system.org/lib?algfp?IsNormalForm
@@ -256,7 +338,6 @@ Declares http://www.gap-system.org/lib?algfp http://www.gap-system.org/lib?algfp
 constant http://www.gap-system.org/lib?algfp?IsSubalgebraFpAlgebra_st34
 Declares http://www.gap-system.org/lib?algfp http://www.gap-system.org/lib?algfp?IsSubalgebraFpAlgebra_st35
 constant http://www.gap-system.org/lib?algfp?IsSubalgebraFpAlgebra_st35
-Includes http://www.gap-system.org/lib?algfp http://www.gap-system.org/lib?algfp
 Declares http://www.gap-system.org/lib?algfp http://www.gap-system.org/lib?algfp?IsFullFpAlgebra
 constant http://www.gap-system.org/lib?algfp?IsFullFpAlgebra
 Declares http://www.gap-system.org/lib?algfp http://www.gap-system.org/lib?algfp?FreeAlgebraOfFpAlgebra
diff --git a/relational/http..www.gap-system.org/lib/alghom.rel b/relational/http..www.gap-system.org/lib/alghom.rel
index a6643ad7afcac1b18ef833f3d0d42ffcb3421f3c..cb167795530441a85c034782e56b1dd8754d386e 100644
--- a/relational/http..www.gap-system.org/lib/alghom.rel
+++ b/relational/http..www.gap-system.org/lib/alghom.rel
@@ -200,6 +200,125 @@ implies http://www.gap-system.org/lib?alghom?IsOperationAlgebraHomomorphismDefau
 implies http://www.gap-system.org/lib?alghom?IsOperationAlgebraHomomorphismDefaultRep_st27 http://www.gap-system.org/lib?mapphomo?RespectsZero
 implies http://www.gap-system.org/lib?alghom?IsOperationAlgebraHomomorphismDefaultRep_st27 http://www.gap-system.org/lib?mapphomo?RespectsAdditiveInverses
 implies http://www.gap-system.org/lib?alghom?IsOperationAlgebraHomomorphismDefaultRep_st27 http://www.gap-system.org/lib?mapphomo?RespectsScalarMultiplication
+dataconstructor http://www.gap-system.org/lib?alghom?IsomorphismMatrixFLMLOR
+dataconstructor http://www.gap-system.org/lib?alghom?IsomorphismSCFLMLOR
+dataconstructor http://www.gap-system.org/lib?alghom?AlgebraWithOneHomomorphismByImagesNC
+dataconstructor http://www.gap-system.org/lib?alghom?AlgebraHomomorphismByImagesNC
+dataconstructor http://www.gap-system.org/lib?alghom?MakePreImagesInfoOperationAlgebraHomomorphism
+dataconstructor http://www.gap-system.org/lib?alghom?RepresentativeLinearOperation
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraGeneralMappingByImagesDefaultRep
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraGeneralMappingByImagesDefaultRep_st0
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraGeneralMappingByImagesDefaultRep_st1
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraGeneralMappingByImagesDefaultRep_st2
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraGeneralMappingByImagesDefaultRep_st3
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraGeneralMappingByImagesDefaultRep_st4
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraGeneralMappingByImagesDefaultRep_st5
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraGeneralMappingByImagesDefaultRep_st6
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraGeneralMappingByImagesDefaultRep_st7
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraGeneralMappingByImagesDefaultRep_st8
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraGeneralMappingByImagesDefaultRep_st9
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraGeneralMappingByImagesDefaultRep_st10
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraGeneralMappingByImagesDefaultRep_st11
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraGeneralMappingByImagesDefaultRep_st12
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraGeneralMappingByImagesDefaultRep_st13
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraGeneralMappingByImagesDefaultRep_st14
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraGeneralMappingByImagesDefaultRep_st15
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraGeneralMappingByImagesDefaultRep_st16
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraGeneralMappingByImagesDefaultRep_st17
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraGeneralMappingByImagesDefaultRep_st18
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraGeneralMappingByImagesDefaultRep_st19
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraGeneralMappingByImagesDefaultRep_st20
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraGeneralMappingByImagesDefaultRep_st21
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraGeneralMappingByImagesDefaultRep_st22
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraGeneralMappingByImagesDefaultRep_st23
+dataconstructor http://www.gap-system.org/lib?alghom?IsPolynomialRingDefaultGeneratorMapping
+dataconstructor http://www.gap-system.org/lib?alghom?IsPolynomialRingDefaultGeneratorMapping_st0
+dataconstructor http://www.gap-system.org/lib?alghom?IsPolynomialRingDefaultGeneratorMapping_st1
+dataconstructor http://www.gap-system.org/lib?alghom?IsPolynomialRingDefaultGeneratorMapping_st2
+dataconstructor http://www.gap-system.org/lib?alghom?IsPolynomialRingDefaultGeneratorMapping_st3
+dataconstructor http://www.gap-system.org/lib?alghom?IsPolynomialRingDefaultGeneratorMapping_st4
+dataconstructor http://www.gap-system.org/lib?alghom?IsPolynomialRingDefaultGeneratorMapping_st5
+dataconstructor http://www.gap-system.org/lib?alghom?IsPolynomialRingDefaultGeneratorMapping_st6
+dataconstructor http://www.gap-system.org/lib?alghom?IsPolynomialRingDefaultGeneratorMapping_st7
+dataconstructor http://www.gap-system.org/lib?alghom?IsPolynomialRingDefaultGeneratorMapping_st8
+dataconstructor http://www.gap-system.org/lib?alghom?IsPolynomialRingDefaultGeneratorMapping_st9
+dataconstructor http://www.gap-system.org/lib?alghom?IsPolynomialRingDefaultGeneratorMapping_st10
+dataconstructor http://www.gap-system.org/lib?alghom?IsPolynomialRingDefaultGeneratorMapping_st11
+dataconstructor http://www.gap-system.org/lib?alghom?IsPolynomialRingDefaultGeneratorMapping_st12
+dataconstructor http://www.gap-system.org/lib?alghom?IsPolynomialRingDefaultGeneratorMapping_st13
+dataconstructor http://www.gap-system.org/lib?alghom?IsPolynomialRingDefaultGeneratorMapping_st14
+dataconstructor http://www.gap-system.org/lib?alghom?IsPolynomialRingDefaultGeneratorMapping_st15
+dataconstructor http://www.gap-system.org/lib?alghom?IsPolynomialRingDefaultGeneratorMapping_st16
+dataconstructor http://www.gap-system.org/lib?alghom?IsPolynomialRingDefaultGeneratorMapping_st17
+dataconstructor http://www.gap-system.org/lib?alghom?IsPolynomialRingDefaultGeneratorMapping_st18
+dataconstructor http://www.gap-system.org/lib?alghom?IsPolynomialRingDefaultGeneratorMapping_st19
+dataconstructor http://www.gap-system.org/lib?alghom?IsPolynomialRingDefaultGeneratorMapping_st20
+dataconstructor http://www.gap-system.org/lib?alghom?IsPolynomialRingDefaultGeneratorMapping_st21
+dataconstructor http://www.gap-system.org/lib?alghom?IsPolynomialRingDefaultGeneratorMapping_st22
+dataconstructor http://www.gap-system.org/lib?alghom?IsPolynomialRingDefaultGeneratorMapping_st23
+dataconstructor http://www.gap-system.org/lib?alghom?IsPolynomialRingDefaultGeneratorMapping_st24
+dataconstructor http://www.gap-system.org/lib?alghom?IsomorphismFpFLMLOR
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraHomomorphismFromFpRep
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraHomomorphismFromFpRep_st0
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraHomomorphismFromFpRep_st1
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraHomomorphismFromFpRep_st2
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraHomomorphismFromFpRep_st3
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraHomomorphismFromFpRep_st4
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraHomomorphismFromFpRep_st5
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraHomomorphismFromFpRep_st6
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraHomomorphismFromFpRep_st7
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraHomomorphismFromFpRep_st8
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraHomomorphismFromFpRep_st9
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraHomomorphismFromFpRep_st10
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraHomomorphismFromFpRep_st11
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraHomomorphismFromFpRep_st12
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraHomomorphismFromFpRep_st13
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraHomomorphismFromFpRep_st14
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraHomomorphismFromFpRep_st15
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraHomomorphismFromFpRep_st16
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraHomomorphismFromFpRep_st17
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraHomomorphismFromFpRep_st18
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraHomomorphismFromFpRep_st19
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraHomomorphismFromFpRep_st20
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraHomomorphismFromFpRep_st21
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraHomomorphismFromFpRep_st22
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraHomomorphismFromFpRep_st23
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraHomomorphismFromFpRep_st24
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraHomomorphismFromFpRep_st25
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraHomomorphismFromFpRep_st26
+dataconstructor http://www.gap-system.org/lib?alghom?IsAlgebraHomomorphismFromFpRep_st27
+dataconstructor http://www.gap-system.org/lib?alghom?OperationAlgebraHomomorphism
+dataconstructor http://www.gap-system.org/lib?alghom?AlgebraGeneralMappingByImages
+dataconstructor http://www.gap-system.org/lib?alghom?AlgebraWithOneGeneralMappingByImages
+dataconstructor http://www.gap-system.org/lib?alghom?IsOperationAlgebraHomomorphismDefaultRep
+dataconstructor http://www.gap-system.org/lib?alghom?IsOperationAlgebraHomomorphismDefaultRep_st0
+dataconstructor http://www.gap-system.org/lib?alghom?IsOperationAlgebraHomomorphismDefaultRep_st1
+dataconstructor http://www.gap-system.org/lib?alghom?IsOperationAlgebraHomomorphismDefaultRep_st2
+dataconstructor http://www.gap-system.org/lib?alghom?IsOperationAlgebraHomomorphismDefaultRep_st3
+dataconstructor http://www.gap-system.org/lib?alghom?IsOperationAlgebraHomomorphismDefaultRep_st4
+dataconstructor http://www.gap-system.org/lib?alghom?IsOperationAlgebraHomomorphismDefaultRep_st5
+dataconstructor http://www.gap-system.org/lib?alghom?IsOperationAlgebraHomomorphismDefaultRep_st6
+dataconstructor http://www.gap-system.org/lib?alghom?IsOperationAlgebraHomomorphismDefaultRep_st7
+dataconstructor http://www.gap-system.org/lib?alghom?IsOperationAlgebraHomomorphismDefaultRep_st8
+dataconstructor http://www.gap-system.org/lib?alghom?IsOperationAlgebraHomomorphismDefaultRep_st9
+dataconstructor http://www.gap-system.org/lib?alghom?IsOperationAlgebraHomomorphismDefaultRep_st10
+dataconstructor http://www.gap-system.org/lib?alghom?IsOperationAlgebraHomomorphismDefaultRep_st11
+dataconstructor http://www.gap-system.org/lib?alghom?IsOperationAlgebraHomomorphismDefaultRep_st12
+dataconstructor http://www.gap-system.org/lib?alghom?IsOperationAlgebraHomomorphismDefaultRep_st13
+dataconstructor http://www.gap-system.org/lib?alghom?IsOperationAlgebraHomomorphismDefaultRep_st14
+dataconstructor http://www.gap-system.org/lib?alghom?IsOperationAlgebraHomomorphismDefaultRep_st15
+dataconstructor http://www.gap-system.org/lib?alghom?IsOperationAlgebraHomomorphismDefaultRep_st16
+dataconstructor http://www.gap-system.org/lib?alghom?IsOperationAlgebraHomomorphismDefaultRep_st17
+dataconstructor http://www.gap-system.org/lib?alghom?IsOperationAlgebraHomomorphismDefaultRep_st18
+dataconstructor http://www.gap-system.org/lib?alghom?IsOperationAlgebraHomomorphismDefaultRep_st19
+dataconstructor http://www.gap-system.org/lib?alghom?IsOperationAlgebraHomomorphismDefaultRep_st20
+dataconstructor http://www.gap-system.org/lib?alghom?IsOperationAlgebraHomomorphismDefaultRep_st21
+dataconstructor http://www.gap-system.org/lib?alghom?IsOperationAlgebraHomomorphismDefaultRep_st22
+dataconstructor http://www.gap-system.org/lib?alghom?IsOperationAlgebraHomomorphismDefaultRep_st23
+dataconstructor http://www.gap-system.org/lib?alghom?IsOperationAlgebraHomomorphismDefaultRep_st24
+dataconstructor http://www.gap-system.org/lib?alghom?IsOperationAlgebraHomomorphismDefaultRep_st25
+dataconstructor http://www.gap-system.org/lib?alghom?IsOperationAlgebraHomomorphismDefaultRep_st26
+dataconstructor http://www.gap-system.org/lib?alghom?IsOperationAlgebraHomomorphismDefaultRep_st27
 theory http://www.gap-system.org/lib?alghom
 HasMeta http://www.gap-system.org/lib?alghom http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?alghom http://www.gap-system.org/lib?extlset
@@ -276,7 +395,6 @@ Declares http://www.gap-system.org/lib?alghom http://www.gap-system.org/lib?algh
 constant http://www.gap-system.org/lib?alghom?IsAlgebraGeneralMappingByImagesDefaultRep_st22
 Declares http://www.gap-system.org/lib?alghom http://www.gap-system.org/lib?alghom?IsAlgebraGeneralMappingByImagesDefaultRep_st23
 constant http://www.gap-system.org/lib?alghom?IsAlgebraGeneralMappingByImagesDefaultRep_st23
-Includes http://www.gap-system.org/lib?alghom http://www.gap-system.org/lib?alghom
 Declares http://www.gap-system.org/lib?alghom http://www.gap-system.org/lib?alghom?IsPolynomialRingDefaultGeneratorMapping
 constant http://www.gap-system.org/lib?alghom?IsPolynomialRingDefaultGeneratorMapping
 Declares http://www.gap-system.org/lib?alghom http://www.gap-system.org/lib?alghom?IsPolynomialRingDefaultGeneratorMapping_st0
diff --git a/relational/http..www.gap-system.org/lib/alglie.rel b/relational/http..www.gap-system.org/lib/alglie.rel
index f014ee032b07224dc5a1d2e916cb31e323abc54f..9a86295b534675c5b5155a0656ca0c168f0a53bb 100644
--- a/relational/http..www.gap-system.org/lib/alglie.rel
+++ b/relational/http..www.gap-system.org/lib/alglie.rel
@@ -533,11 +533,110 @@ implies http://www.gap-system.org/lib?alglie?PthPowerImage http://www.gap-system
 implies http://www.gap-system.org/lib?alglie?PthPowerImage http://www.gap-system.org/lib?arith?IsMultiplicativeElement
 implies http://www.gap-system.org/lib?alglie?PthPowerImage http://www.gap-system.org/lib?arith?IsJacobianElement
 implies http://www.gap-system.org/lib?alglie?PthPowerImage http://www.gap-system.org/lib?cyclotom?IsInt
+dataconstructor http://www.gap-system.org/lib?alglie?IsRootSystem
+dataconstructor http://www.gap-system.org/lib?alglie?SimpleSystem
+dataconstructor http://www.gap-system.org/lib?alglie?UniversalEnvelopingAlgebra
+dataconstructor http://www.gap-system.org/lib?alglie?PCentralLieAlgebra
+dataconstructor http://www.gap-system.org/lib?alglie?LieCentre
+dataconstructor http://www.gap-system.org/lib?alglie?NonNilpotentElement
+dataconstructor http://www.gap-system.org/lib?alglie?AdjointMatrix
+dataconstructor http://www.gap-system.org/lib?alglie?LieDerivedSubalgebra
+dataconstructor http://www.gap-system.org/lib?alglie?IsFamilyElementOfFreeLieAlgebra
+dataconstructor http://www.gap-system.org/lib?alglie?IsFamilyElementOfFreeLieAlgebra_st0
+dataconstructor http://www.gap-system.org/lib?alglie?IsFamilyElementOfFreeLieAlgebra_st1
+dataconstructor http://www.gap-system.org/lib?alglie?IsFamilyElementOfFreeLieAlgebra_st2
+dataconstructor http://www.gap-system.org/lib?alglie?IsFamilyElementOfFreeLieAlgebra_st3
+dataconstructor http://www.gap-system.org/lib?alglie?LieCentralizerInParent
+dataconstructor http://www.gap-system.org/lib?alglie?PowerS
+dataconstructor http://www.gap-system.org/lib?alglie?KappaPerp
+dataconstructor http://www.gap-system.org/lib?alglie?IsRootSystemFromLieAlgebra
+dataconstructor http://www.gap-system.org/lib?alglie?IsRootSystemFromLieAlgebra_st0
+dataconstructor http://www.gap-system.org/lib?alglie?PositiveRootVectors
+dataconstructor http://www.gap-system.org/lib?alglie?PositiveRoots
+dataconstructor http://www.gap-system.org/lib?alglie?RootSystem
+dataconstructor http://www.gap-system.org/lib?alglie?CartanSubalgebra
+dataconstructor http://www.gap-system.org/lib?alglie?IsSpaceOfUEAElements
+dataconstructor http://www.gap-system.org/lib?alglie?IsSpaceOfUEAElements_st0
+dataconstructor http://www.gap-system.org/lib?alglie?IsSpaceOfUEAElements_st1
+dataconstructor http://www.gap-system.org/lib?alglie?IsSpaceOfUEAElements_st2
+dataconstructor http://www.gap-system.org/lib?alglie?IsSpaceOfUEAElements_st3
+dataconstructor http://www.gap-system.org/lib?alglie?IsSpaceOfUEAElements_st4
+dataconstructor http://www.gap-system.org/lib?alglie?IsSpaceOfUEAElements_st5
+dataconstructor http://www.gap-system.org/lib?alglie?IsSpaceOfUEAElements_st6
+dataconstructor http://www.gap-system.org/lib?alglie?IsSpaceOfUEAElements_st7
+dataconstructor http://www.gap-system.org/lib?alglie?IsSpaceOfUEAElements_st8
+dataconstructor http://www.gap-system.org/lib?alglie?IsSpaceOfUEAElements_st9
+dataconstructor http://www.gap-system.org/lib?alglie?IsSpaceOfUEAElements_st10
+dataconstructor http://www.gap-system.org/lib?alglie?IsSpaceOfUEAElements_st11
+dataconstructor http://www.gap-system.org/lib?alglie?IsSpaceOfUEAElements_st12
+dataconstructor http://www.gap-system.org/lib?alglie?IsSpaceOfUEAElements_st13
+dataconstructor http://www.gap-system.org/lib?alglie?IsSpaceOfUEAElements_st14
+dataconstructor http://www.gap-system.org/lib?alglie?IsSpaceOfUEAElements_st15
+dataconstructor http://www.gap-system.org/lib?alglie?IsSpaceOfUEAElements_st16
+dataconstructor http://www.gap-system.org/lib?alglie?IsSpaceOfUEAElements_st17
+dataconstructor http://www.gap-system.org/lib?alglie?IsSpaceOfUEAElements_st18
+dataconstructor http://www.gap-system.org/lib?alglie?IsSpaceOfUEAElements_st19
+dataconstructor http://www.gap-system.org/lib?alglie?IsSpaceOfUEAElements_st20
+dataconstructor http://www.gap-system.org/lib?alglie?IsSpaceOfUEAElements_st21
+dataconstructor http://www.gap-system.org/lib?alglie?IsSpaceOfUEAElements_st22
+dataconstructor http://www.gap-system.org/lib?alglie?IsSpaceOfUEAElements_st23
+dataconstructor http://www.gap-system.org/lib?alglie?IsSpaceOfUEAElements_st24
+dataconstructor http://www.gap-system.org/lib?alglie?IsSpaceOfUEAElements_st25
+dataconstructor http://www.gap-system.org/lib?alglie?UnderlyingLieAlgebra
+dataconstructor http://www.gap-system.org/lib?alglie?IsLieSolvable
+dataconstructor http://www.gap-system.org/lib?alglie?SemiSimpleType
+dataconstructor http://www.gap-system.org/lib?alglie?KillingMatrix
+dataconstructor http://www.gap-system.org/lib?alglie?LieUpperCentralSeries
+dataconstructor http://www.gap-system.org/lib?alglie?LieCentralizer
+dataconstructor http://www.gap-system.org/lib?alglie?PClosureSubalgebra
+dataconstructor http://www.gap-system.org/lib?alglie?BilinearFormMat
+dataconstructor http://www.gap-system.org/lib?alglie?LieNormalizerInParent
+dataconstructor http://www.gap-system.org/lib?alglie?LeftDerivations
+dataconstructor http://www.gap-system.org/lib?alglie?CanonicalGenerators
+dataconstructor http://www.gap-system.org/lib?alglie?NaturalHomomorphismOfLieAlgebraFromNilpotentGroup
+dataconstructor http://www.gap-system.org/lib?alglie?NegativeRootVectors
+dataconstructor http://www.gap-system.org/lib?alglie?LieNilRadical
+dataconstructor http://www.gap-system.org/lib?alglie?LieSolvableRadical
+dataconstructor http://www.gap-system.org/lib?alglie?ChevalleyBasis
+dataconstructor http://www.gap-system.org/lib?alglie?CartanMatrix
+dataconstructor http://www.gap-system.org/lib?alglie?LieLowerCentralSeries
+dataconstructor http://www.gap-system.org/lib?alglie?IsLieNilpotent
+dataconstructor http://www.gap-system.org/lib?alglie?LieNormalizer
+dataconstructor http://www.gap-system.org/lib?alglie?PthPowerImages
+dataconstructor http://www.gap-system.org/lib?alglie?LieDerivedSeries
+dataconstructor http://www.gap-system.org/lib?alglie?NegativeRoots
+dataconstructor http://www.gap-system.org/lib?alglie?IsLieAbelian
+dataconstructor http://www.gap-system.org/lib?alglie?JenningsLieAlgebra
+dataconstructor http://www.gap-system.org/lib?alglie?RightDerivations
+dataconstructor http://www.gap-system.org/lib?alglie?IsRestrictedLieAlgebra
+dataconstructor http://www.gap-system.org/lib?alglie?AdjointAssociativeAlgebra
+dataconstructor http://www.gap-system.org/lib?alglie?IsFptoSCAMorphism
+dataconstructor http://www.gap-system.org/lib?alglie?IsFptoSCAMorphism_st0
+dataconstructor http://www.gap-system.org/lib?alglie?IsFptoSCAMorphism_st1
+dataconstructor http://www.gap-system.org/lib?alglie?IsFptoSCAMorphism_st2
+dataconstructor http://www.gap-system.org/lib?alglie?IsFptoSCAMorphism_st3
+dataconstructor http://www.gap-system.org/lib?alglie?IsFptoSCAMorphism_st4
+dataconstructor http://www.gap-system.org/lib?alglie?IsFptoSCAMorphism_st5
+dataconstructor http://www.gap-system.org/lib?alglie?IsFptoSCAMorphism_st6
+dataconstructor http://www.gap-system.org/lib?alglie?IsFptoSCAMorphism_st7
+dataconstructor http://www.gap-system.org/lib?alglie?IsFptoSCAMorphism_st8
+dataconstructor http://www.gap-system.org/lib?alglie?IsFptoSCAMorphism_st9
+dataconstructor http://www.gap-system.org/lib?alglie?IsFptoSCAMorphism_st10
+dataconstructor http://www.gap-system.org/lib?alglie?IsFptoSCAMorphism_st11
+dataconstructor http://www.gap-system.org/lib?alglie?IsFptoSCAMorphism_st12
+dataconstructor http://www.gap-system.org/lib?alglie?IsFptoSCAMorphism_st13
+dataconstructor http://www.gap-system.org/lib?alglie?IsFptoSCAMorphism_st14
+dataconstructor http://www.gap-system.org/lib?alglie?IsFptoSCAMorphism_st15
+dataconstructor http://www.gap-system.org/lib?alglie?IsFptoSCAMorphism_st16
+dataconstructor http://www.gap-system.org/lib?alglie?IsFptoSCAMorphism_st17
+dataconstructor http://www.gap-system.org/lib?alglie?IsFptoSCAMorphism_st18
+dataconstructor http://www.gap-system.org/lib?alglie?IsFptoSCAMorphism_st19
+dataconstructor http://www.gap-system.org/lib?alglie?IsFptoSCAMorphism_st20
+dataconstructor http://www.gap-system.org/lib?alglie?PthPowerImage
 theory http://www.gap-system.org/lib?alglie
 HasMeta http://www.gap-system.org/lib?alglie http://www.gap-system.org/?Types
 Declares http://www.gap-system.org/lib?alglie http://www.gap-system.org/lib?alglie?IsRootSystem
 constant http://www.gap-system.org/lib?alglie?IsRootSystem
-Includes http://www.gap-system.org/lib?alglie http://www.gap-system.org/lib?alglie
 Declares http://www.gap-system.org/lib?alglie http://www.gap-system.org/lib?alglie?SimpleSystem
 constant http://www.gap-system.org/lib?alglie?SimpleSystem
 Includes http://www.gap-system.org/lib?alglie http://www.gap-system.org/lib?extlset
diff --git a/relational/http..www.gap-system.org/lib/algrep.rel b/relational/http..www.gap-system.org/lib/algrep.rel
index f43fd4b4c6bbf60f50d498fd8e29a77f6f73ac66..c2adfaf2ac04c6d0011efa5117aa6fcbaf34f066 100644
--- a/relational/http..www.gap-system.org/lib/algrep.rel
+++ b/relational/http..www.gap-system.org/lib/algrep.rel
@@ -405,13 +405,163 @@ implies http://www.gap-system.org/lib?algrep?FaithfulModule http://www.gap-syste
 implies http://www.gap-system.org/lib?algrep?FaithfulModule http://www.gap-system.org/lib?addmagma?IsAdditivelyCommutative
 implies http://www.gap-system.org/lib?algrep?FaithfulModule http://www.gap-system.org/lib?semiring?IsLDistributive
 implies http://www.gap-system.org/lib?algrep?FaithfulModule http://www.gap-system.org/lib?semiring?IsRDistributive
+dataconstructor http://www.gap-system.org/lib?algrep?IsAlgebraModule
+dataconstructor http://www.gap-system.org/lib?algrep?ModuleByRestriction
+dataconstructor http://www.gap-system.org/lib?algrep?IsMonomialElement
+dataconstructor http://www.gap-system.org/lib?algrep?IsMonomialElement_st0
+dataconstructor http://www.gap-system.org/lib?algrep?IsMonomialElement_st1
+dataconstructor http://www.gap-system.org/lib?algrep?IsMonomialElement_st2
+dataconstructor http://www.gap-system.org/lib?algrep?IsMonomialElement_st3
+dataconstructor http://www.gap-system.org/lib?algrep?IsMonomialElement_st4
+dataconstructor http://www.gap-system.org/lib?algrep?IsMonomialElement_st5
+dataconstructor http://www.gap-system.org/lib?algrep?IsMonomialElement_st6
+dataconstructor http://www.gap-system.org/lib?algrep?ConvertToNormalFormMonomialElement
+dataconstructor http://www.gap-system.org/lib?algrep?ExteriorPowerOfAlgebraModule
+dataconstructor http://www.gap-system.org/lib?algrep?IsBasisOfAlgebraModuleElementSpace
+dataconstructor http://www.gap-system.org/lib?algrep?IsBasisOfAlgebraModuleElementSpace_st0
+dataconstructor http://www.gap-system.org/lib?algrep?IsBasisOfAlgebraModuleElementSpace_st1
+dataconstructor http://www.gap-system.org/lib?algrep?IsBasisOfAlgebraModuleElementSpace_st2
+dataconstructor http://www.gap-system.org/lib?algrep?IsBasisOfAlgebraModuleElementSpace_st3
+dataconstructor http://www.gap-system.org/lib?algrep?IsBasisOfAlgebraModuleElementSpace_st4
+dataconstructor http://www.gap-system.org/lib?algrep?IsBasisOfAlgebraModuleElementSpace_st5
+dataconstructor http://www.gap-system.org/lib?algrep?IsBasisOfAlgebraModuleElementSpace_st6
+dataconstructor http://www.gap-system.org/lib?algrep?MatrixOfAction
+dataconstructor http://www.gap-system.org/lib?algrep?IsRightAlgebraModule
+dataconstructor http://www.gap-system.org/lib?algrep?IsWedgeElement
+dataconstructor http://www.gap-system.org/lib?algrep?IsWedgeElement_st0
+dataconstructor http://www.gap-system.org/lib?algrep?IsWedgeElement_st1
+dataconstructor http://www.gap-system.org/lib?algrep?IsWedgeElement_st2
+dataconstructor http://www.gap-system.org/lib?algrep?IsWedgeElement_st3
+dataconstructor http://www.gap-system.org/lib?algrep?IsWedgeElement_st4
+dataconstructor http://www.gap-system.org/lib?algrep?IsWedgeElement_st5
+dataconstructor http://www.gap-system.org/lib?algrep?IsWedgeElement_st6
+dataconstructor http://www.gap-system.org/lib?algrep?IsWedgeElement_st7
+dataconstructor http://www.gap-system.org/lib?algrep?IsDirectSumElementsSpace
+dataconstructor http://www.gap-system.org/lib?algrep?IsDirectSumElementsSpace_st0
+dataconstructor http://www.gap-system.org/lib?algrep?IsDirectSumElementsSpace_st1
+dataconstructor http://www.gap-system.org/lib?algrep?IsDirectSumElementsSpace_st2
+dataconstructor http://www.gap-system.org/lib?algrep?IsDirectSumElementsSpace_st3
+dataconstructor http://www.gap-system.org/lib?algrep?IsDirectSumElementsSpace_st4
+dataconstructor http://www.gap-system.org/lib?algrep?IsDirectSumElementsSpace_st5
+dataconstructor http://www.gap-system.org/lib?algrep?IsDirectSumElementsSpace_st6
+dataconstructor http://www.gap-system.org/lib?algrep?IsDirectSumElementsSpace_st7
+dataconstructor http://www.gap-system.org/lib?algrep?IsDirectSumElementsSpace_st8
+dataconstructor http://www.gap-system.org/lib?algrep?IsDirectSumElementsSpace_st9
+dataconstructor http://www.gap-system.org/lib?algrep?IsDirectSumElementsSpace_st10
+dataconstructor http://www.gap-system.org/lib?algrep?IsDirectSumElementsSpace_st11
+dataconstructor http://www.gap-system.org/lib?algrep?IsDirectSumElementsSpace_st12
+dataconstructor http://www.gap-system.org/lib?algrep?IsDirectSumElementsSpace_st13
+dataconstructor http://www.gap-system.org/lib?algrep?IsDirectSumElementsSpace_st14
+dataconstructor http://www.gap-system.org/lib?algrep?IsDirectSumElementsSpace_st15
+dataconstructor http://www.gap-system.org/lib?algrep?IsDirectSumElementsSpace_st16
+dataconstructor http://www.gap-system.org/lib?algrep?IsDirectSumElementsSpace_st17
+dataconstructor http://www.gap-system.org/lib?algrep?IsDirectSumElementsSpace_st18
+dataconstructor http://www.gap-system.org/lib?algrep?IsDirectSumElementsSpace_st19
+dataconstructor http://www.gap-system.org/lib?algrep?IsDirectSumElementsSpace_st20
+dataconstructor http://www.gap-system.org/lib?algrep?IsDirectSumElementsSpace_st21
+dataconstructor http://www.gap-system.org/lib?algrep?IsDirectSumElementsSpace_st22
+dataconstructor http://www.gap-system.org/lib?algrep?IsDirectSumElementsSpace_st23
+dataconstructor http://www.gap-system.org/lib?algrep?IsDirectSumElementsSpace_st24
+dataconstructor http://www.gap-system.org/lib?algrep?IsDirectSumElementsSpace_st25
+dataconstructor http://www.gap-system.org/lib?algrep?SymmetricPowerOfAlgebraModule
+dataconstructor http://www.gap-system.org/lib?algrep?NaturalHomomorphismBySubAlgebraModule
+dataconstructor http://www.gap-system.org/lib?algrep?RightAlgebraModuleByGenerators
+dataconstructor http://www.gap-system.org/lib?algrep?LeftActingAlgebra
+dataconstructor http://www.gap-system.org/lib?algrep?IsBasisOfMonomialSpaceRep
+dataconstructor http://www.gap-system.org/lib?algrep?IsBasisOfMonomialSpaceRep_st0
+dataconstructor http://www.gap-system.org/lib?algrep?IsSparseRowSpaceElement
+dataconstructor http://www.gap-system.org/lib?algrep?IsSparseRowSpaceElement_st0
+dataconstructor http://www.gap-system.org/lib?algrep?IsSparseRowSpaceElement_st1
+dataconstructor http://www.gap-system.org/lib?algrep?IsSparseRowSpaceElement_st2
+dataconstructor http://www.gap-system.org/lib?algrep?IsSparseRowSpaceElement_st3
+dataconstructor http://www.gap-system.org/lib?algrep?IsSparseRowSpaceElement_st4
+dataconstructor http://www.gap-system.org/lib?algrep?IsSparseRowSpaceElement_st5
+dataconstructor http://www.gap-system.org/lib?algrep?IsSparseRowSpaceElement_st6
+dataconstructor http://www.gap-system.org/lib?algrep?DirectSumOfAlgebraModules
+dataconstructor http://www.gap-system.org/lib?algrep?GeneratorsOfAlgebraModule
+dataconstructor http://www.gap-system.org/lib?algrep?IsMutableBasisViaUnderlyingMutableBasisRep
+dataconstructor http://www.gap-system.org/lib?algrep?IsMutableBasisViaUnderlyingMutableBasisRep_st0
+dataconstructor http://www.gap-system.org/lib?algrep?LeftAlgebraModuleByGenerators
+dataconstructor http://www.gap-system.org/lib?algrep?TensorProductOfAlgebraModules
+dataconstructor http://www.gap-system.org/lib?algrep?LeftModuleByHomomorphismToMatAlg
+dataconstructor http://www.gap-system.org/lib?algrep?LeftAlgebraModule
+dataconstructor http://www.gap-system.org/lib?algrep?RightAlgebraModule
+dataconstructor http://www.gap-system.org/lib?algrep?BiAlgebraModuleByGenerators
+dataconstructor http://www.gap-system.org/lib?algrep?IsAlgebraModuleElement
+dataconstructor http://www.gap-system.org/lib?algrep?IsAlgebraModuleElement_st0
+dataconstructor http://www.gap-system.org/lib?algrep?IsAlgebraModuleElement_st1
+dataconstructor http://www.gap-system.org/lib?algrep?IsAlgebraModuleElement_st2
+dataconstructor http://www.gap-system.org/lib?algrep?IsAlgebraModuleElement_st3
+dataconstructor http://www.gap-system.org/lib?algrep?IsAlgebraModuleElement_st4
+dataconstructor http://www.gap-system.org/lib?algrep?IsAlgebraModuleElement_st5
+dataconstructor http://www.gap-system.org/lib?algrep?IsAlgebraModuleElement_st6
+dataconstructor http://www.gap-system.org/lib?algrep?IsLeftAlgebraModuleElement
+dataconstructor http://www.gap-system.org/lib?algrep?IsLeftAlgebraModuleElement_st0
+dataconstructor http://www.gap-system.org/lib?algrep?IsLeftAlgebraModuleElement_st1
+dataconstructor http://www.gap-system.org/lib?algrep?IsLeftAlgebraModuleElement_st2
+dataconstructor http://www.gap-system.org/lib?algrep?IsLeftAlgebraModuleElement_st3
+dataconstructor http://www.gap-system.org/lib?algrep?IsLeftAlgebraModuleElement_st4
+dataconstructor http://www.gap-system.org/lib?algrep?IsLeftAlgebraModuleElement_st5
+dataconstructor http://www.gap-system.org/lib?algrep?IsLeftAlgebraModuleElement_st6
+dataconstructor http://www.gap-system.org/lib?algrep?IsLeftAlgebraModuleElement_st7
+dataconstructor http://www.gap-system.org/lib?algrep?ActingAlgebra
+dataconstructor http://www.gap-system.org/lib?algrep?AdjointModule
+dataconstructor http://www.gap-system.org/lib?algrep?TensorProductOp
+dataconstructor http://www.gap-system.org/lib?algrep?IsMonomialElementRep
+dataconstructor http://www.gap-system.org/lib?algrep?IsMonomialElementRep_st0
+dataconstructor http://www.gap-system.org/lib?algrep?IsBasisOfSparseRowSpaceRep
+dataconstructor http://www.gap-system.org/lib?algrep?IsBasisOfSparseRowSpaceRep_st0
+dataconstructor http://www.gap-system.org/lib?algrep?FullSparseRowSpace
+dataconstructor http://www.gap-system.org/lib?algrep?SubAlgebraModule
+dataconstructor http://www.gap-system.org/lib?algrep?BiAlgebraModule
+dataconstructor http://www.gap-system.org/lib?algrep?TranslatorSubalgebra
+dataconstructor http://www.gap-system.org/lib?algrep?RightModuleByHomomorphismToMatAlg
+dataconstructor http://www.gap-system.org/lib?algrep?ExteriorPower
+dataconstructor http://www.gap-system.org/lib?algrep?SymmetricPower
+dataconstructor http://www.gap-system.org/lib?algrep?IsDirectSumElement
+dataconstructor http://www.gap-system.org/lib?algrep?IsDirectSumElement_st0
+dataconstructor http://www.gap-system.org/lib?algrep?IsDirectSumElement_st1
+dataconstructor http://www.gap-system.org/lib?algrep?IsDirectSumElement_st2
+dataconstructor http://www.gap-system.org/lib?algrep?IsDirectSumElement_st3
+dataconstructor http://www.gap-system.org/lib?algrep?IsDirectSumElement_st4
+dataconstructor http://www.gap-system.org/lib?algrep?IsDirectSumElement_st5
+dataconstructor http://www.gap-system.org/lib?algrep?IsDirectSumElement_st6
+dataconstructor http://www.gap-system.org/lib?algrep?IsLeftAlgebraModule
+dataconstructor http://www.gap-system.org/lib?algrep?RightActingAlgebra
+dataconstructor http://www.gap-system.org/lib?algrep?IsRightAlgebraModuleElement
+dataconstructor http://www.gap-system.org/lib?algrep?IsRightAlgebraModuleElement_st0
+dataconstructor http://www.gap-system.org/lib?algrep?IsRightAlgebraModuleElement_st1
+dataconstructor http://www.gap-system.org/lib?algrep?IsRightAlgebraModuleElement_st2
+dataconstructor http://www.gap-system.org/lib?algrep?IsRightAlgebraModuleElement_st3
+dataconstructor http://www.gap-system.org/lib?algrep?IsRightAlgebraModuleElement_st4
+dataconstructor http://www.gap-system.org/lib?algrep?IsRightAlgebraModuleElement_st5
+dataconstructor http://www.gap-system.org/lib?algrep?IsRightAlgebraModuleElement_st6
+dataconstructor http://www.gap-system.org/lib?algrep?IsRightAlgebraModuleElement_st7
+dataconstructor http://www.gap-system.org/lib?algrep?IsSymmetricPowerElement
+dataconstructor http://www.gap-system.org/lib?algrep?IsSymmetricPowerElement_st0
+dataconstructor http://www.gap-system.org/lib?algrep?IsSymmetricPowerElement_st1
+dataconstructor http://www.gap-system.org/lib?algrep?IsSymmetricPowerElement_st2
+dataconstructor http://www.gap-system.org/lib?algrep?IsSymmetricPowerElement_st3
+dataconstructor http://www.gap-system.org/lib?algrep?IsSymmetricPowerElement_st4
+dataconstructor http://www.gap-system.org/lib?algrep?IsSymmetricPowerElement_st5
+dataconstructor http://www.gap-system.org/lib?algrep?IsSymmetricPowerElement_st6
+dataconstructor http://www.gap-system.org/lib?algrep?IsSymmetricPowerElement_st7
+dataconstructor http://www.gap-system.org/lib?algrep?IsTensorElement
+dataconstructor http://www.gap-system.org/lib?algrep?IsTensorElement_st0
+dataconstructor http://www.gap-system.org/lib?algrep?IsTensorElement_st1
+dataconstructor http://www.gap-system.org/lib?algrep?IsTensorElement_st2
+dataconstructor http://www.gap-system.org/lib?algrep?IsTensorElement_st3
+dataconstructor http://www.gap-system.org/lib?algrep?IsTensorElement_st4
+dataconstructor http://www.gap-system.org/lib?algrep?IsTensorElement_st5
+dataconstructor http://www.gap-system.org/lib?algrep?IsTensorElement_st6
+dataconstructor http://www.gap-system.org/lib?algrep?IsTensorElement_st7
+dataconstructor http://www.gap-system.org/lib?algrep?FaithfulModule
 theory http://www.gap-system.org/lib?algrep
 HasMeta http://www.gap-system.org/lib?algrep http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?algrep http://www.gap-system.org/lib?extlset
 Includes http://www.gap-system.org/lib?algrep http://www.gap-system.org/lib?addmagma
 Declares http://www.gap-system.org/lib?algrep http://www.gap-system.org/lib?algrep?IsAlgebraModule
 constant http://www.gap-system.org/lib?algrep?IsAlgebraModule
-Includes http://www.gap-system.org/lib?algrep http://www.gap-system.org/lib?algrep
 Includes http://www.gap-system.org/lib?algrep http://www.gap-system.org/lib?magma
 Includes http://www.gap-system.org/lib?algrep http://www.gap-system.org/lib?semiring
 Declares http://www.gap-system.org/lib?algrep http://www.gap-system.org/lib?algrep?ModuleByRestriction
diff --git a/relational/http..www.gap-system.org/lib/algsc.rel b/relational/http..www.gap-system.org/lib/algsc.rel
index 86b78c240355bc275650a0322f6004d420a162dd..0582b6e57dd522d5b0f26473d97f9c5045aa5a08 100644
--- a/relational/http..www.gap-system.org/lib/algsc.rel
+++ b/relational/http..www.gap-system.org/lib/algsc.rel
@@ -51,6 +51,50 @@ implies http://www.gap-system.org/lib?algsc?IsFullSCAlgebra http://www.gap-syste
 implies http://www.gap-system.org/lib?algsc?IsFullSCAlgebra http://www.gap-system.org/lib?semiring?IsRDistributive
 implies http://www.gap-system.org/lib?algsc?IsFullSCAlgebra http://www.gap-system.org/lib?module?IsFreeLeftModule
 implies http://www.gap-system.org/lib?algsc?IsFullSCAlgebra http://www.gap-system.org/lib?algsc?IsSCAlgebraObj
+dataconstructor http://www.gap-system.org/lib?algsc?IsCanonicalBasisFullSCAlgebra
+dataconstructor http://www.gap-system.org/lib?algsc?IsDenseCoeffVectorRep
+dataconstructor http://www.gap-system.org/lib?algsc?IsDenseCoeffVectorRep_st0
+dataconstructor http://www.gap-system.org/lib?algsc?IsSCAlgebraObj
+dataconstructor http://www.gap-system.org/lib?algsc?IsSCAlgebraObj_st0
+dataconstructor http://www.gap-system.org/lib?algsc?IsSCAlgebraObj_st1
+dataconstructor http://www.gap-system.org/lib?algsc?IsSCAlgebraObj_st2
+dataconstructor http://www.gap-system.org/lib?algsc?IsSCAlgebraObj_st3
+dataconstructor http://www.gap-system.org/lib?algsc?IsSCAlgebraObj_st4
+dataconstructor http://www.gap-system.org/lib?algsc?IsSCAlgebraObj_st5
+dataconstructor http://www.gap-system.org/lib?algsc?IsSCAlgebraObj_st6
+dataconstructor http://www.gap-system.org/lib?algsc?IsSCAlgebraObj_st7
+dataconstructor http://www.gap-system.org/lib?algsc?IsSCAlgebraObj_st8
+dataconstructor http://www.gap-system.org/lib?algsc?IsSCAlgebraObj_st9
+dataconstructor http://www.gap-system.org/lib?algsc?IsFamilyOverFullCoefficientsFamily
+dataconstructor http://www.gap-system.org/lib?algsc?IsFamilyOverFullCoefficientsFamily_st0
+dataconstructor http://www.gap-system.org/lib?algsc?IsSCAlgebraObjSpace
+dataconstructor http://www.gap-system.org/lib?algsc?IsSCAlgebraObjSpace_st0
+dataconstructor http://www.gap-system.org/lib?algsc?IsSCAlgebraObjSpace_st1
+dataconstructor http://www.gap-system.org/lib?algsc?IsSCAlgebraObjSpace_st2
+dataconstructor http://www.gap-system.org/lib?algsc?IsSCAlgebraObjSpace_st3
+dataconstructor http://www.gap-system.org/lib?algsc?IsSCAlgebraObjSpace_st4
+dataconstructor http://www.gap-system.org/lib?algsc?IsSCAlgebraObjSpace_st5
+dataconstructor http://www.gap-system.org/lib?algsc?IsSCAlgebraObjSpace_st6
+dataconstructor http://www.gap-system.org/lib?algsc?IsSCAlgebraObjSpace_st7
+dataconstructor http://www.gap-system.org/lib?algsc?IsSCAlgebraObjSpace_st8
+dataconstructor http://www.gap-system.org/lib?algsc?IsSCAlgebraObjSpace_st9
+dataconstructor http://www.gap-system.org/lib?algsc?IsSCAlgebraObjSpace_st10
+dataconstructor http://www.gap-system.org/lib?algsc?IsSCAlgebraObjSpace_st11
+dataconstructor http://www.gap-system.org/lib?algsc?IsSCAlgebraObjSpace_st12
+dataconstructor http://www.gap-system.org/lib?algsc?IsSCAlgebraObjSpace_st13
+dataconstructor http://www.gap-system.org/lib?algsc?IsSCAlgebraObjSpace_st14
+dataconstructor http://www.gap-system.org/lib?algsc?IsSCAlgebraObjSpace_st15
+dataconstructor http://www.gap-system.org/lib?algsc?IsSCAlgebraObjSpace_st16
+dataconstructor http://www.gap-system.org/lib?algsc?IsSCAlgebraObjSpace_st17
+dataconstructor http://www.gap-system.org/lib?algsc?IsSCAlgebraObjSpace_st18
+dataconstructor http://www.gap-system.org/lib?algsc?IsSCAlgebraObjSpace_st19
+dataconstructor http://www.gap-system.org/lib?algsc?IsSCAlgebraObjSpace_st20
+dataconstructor http://www.gap-system.org/lib?algsc?IsSCAlgebraObjSpace_st21
+dataconstructor http://www.gap-system.org/lib?algsc?IsSCAlgebraObjSpace_st22
+dataconstructor http://www.gap-system.org/lib?algsc?IsSCAlgebraObjSpace_st23
+dataconstructor http://www.gap-system.org/lib?algsc?IsSCAlgebraObjSpace_st24
+dataconstructor http://www.gap-system.org/lib?algsc?IsSCAlgebraObjSpace_st25
+dataconstructor http://www.gap-system.org/lib?algsc?IsFullSCAlgebra
 theory http://www.gap-system.org/lib?algsc
 HasMeta http://www.gap-system.org/lib?algsc http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?algsc http://www.gap-system.org/lib?basis
@@ -150,6 +194,5 @@ Declares http://www.gap-system.org/lib?algsc http://www.gap-system.org/lib?algsc
 constant http://www.gap-system.org/lib?algsc?IsSCAlgebraObjSpace_st25
 Includes http://www.gap-system.org/lib?algsc http://www.gap-system.org/lib?magma
 Includes http://www.gap-system.org/lib?algsc http://www.gap-system.org/lib?semiring
-Includes http://www.gap-system.org/lib?algsc http://www.gap-system.org/lib?algsc
 Declares http://www.gap-system.org/lib?algsc http://www.gap-system.org/lib?algsc?IsFullSCAlgebra
 constant http://www.gap-system.org/lib?algsc?IsFullSCAlgebra
diff --git a/relational/http..www.gap-system.org/lib/arith.rel b/relational/http..www.gap-system.org/lib/arith.rel
index 5465b41ebdb2eae7034567ff4d74e9b623be5d29..abf540fa9039920c3be0cc558ded98122ee5a831 100644
--- a/relational/http..www.gap-system.org/lib/arith.rel
+++ b/relational/http..www.gap-system.org/lib/arith.rel
@@ -541,11 +541,329 @@ IsFilter http://www.gap-system.org/lib?arith?IsNearRingElementWithInverseTable
 implies http://www.gap-system.org/lib?arith?IsNearRingElementWithInverseTable http://www.gap-system.org/lib?list?IsTable
 implies http://www.gap-system.org/lib?arith?IsNearRingElementWithInverseTable http://www.gap-system.org/lib?arith?IsNearAdditiveElementWithInverse
 implies http://www.gap-system.org/lib?arith?IsNearRingElementWithInverseTable http://www.gap-system.org/lib?arith?IsMultiplicativeElementWithInverse
+dataconstructor http://www.gap-system.org/lib?arith?IsExtAElement
+dataconstructor http://www.gap-system.org/lib?arith?IsNearAdditiveElement
+dataconstructor http://www.gap-system.org/lib?arith?IsNearAdditiveElement_st0
+dataconstructor http://www.gap-system.org/lib?arith?IsNearAdditiveElementWithZero
+dataconstructor http://www.gap-system.org/lib?arith?IsNearAdditiveElementWithZero_st0
+dataconstructor http://www.gap-system.org/lib?arith?IsNearAdditiveElementWithZero_st1
+dataconstructor http://www.gap-system.org/lib?arith?IsNearAdditiveElementWithInverse
+dataconstructor http://www.gap-system.org/lib?arith?IsNearAdditiveElementWithInverse_st0
+dataconstructor http://www.gap-system.org/lib?arith?IsNearAdditiveElementWithInverse_st1
+dataconstructor http://www.gap-system.org/lib?arith?IsNearAdditiveElementWithInverse_st2
+dataconstructor http://www.gap-system.org/lib?arith?IsExtLElement
+dataconstructor http://www.gap-system.org/lib?arith?IsExtRElement
+dataconstructor http://www.gap-system.org/lib?arith?IsMultiplicativeElement
+dataconstructor http://www.gap-system.org/lib?arith?IsMultiplicativeElement_st0
+dataconstructor http://www.gap-system.org/lib?arith?IsMultiplicativeElement_st1
+dataconstructor http://www.gap-system.org/lib?arith?IsAdditiveElement
+dataconstructor http://www.gap-system.org/lib?arith?IsAdditiveElement_st0
+dataconstructor http://www.gap-system.org/lib?arith?IsAdditiveElement_st1
+dataconstructor http://www.gap-system.org/lib?arith?IsMultiplicativeElementWithOne
+dataconstructor http://www.gap-system.org/lib?arith?IsMultiplicativeElementWithOne_st0
+dataconstructor http://www.gap-system.org/lib?arith?IsMultiplicativeElementWithOne_st1
+dataconstructor http://www.gap-system.org/lib?arith?IsMultiplicativeElementWithOne_st2
+dataconstructor http://www.gap-system.org/lib?arith?IsMultiplicativeElementWithInverse
+dataconstructor http://www.gap-system.org/lib?arith?IsMultiplicativeElementWithInverse_st0
+dataconstructor http://www.gap-system.org/lib?arith?IsMultiplicativeElementWithInverse_st1
+dataconstructor http://www.gap-system.org/lib?arith?IsMultiplicativeElementWithInverse_st2
+dataconstructor http://www.gap-system.org/lib?arith?IsMultiplicativeElementWithInverse_st3
+dataconstructor http://www.gap-system.org/lib?arith?IsZDFRE
+dataconstructor http://www.gap-system.org/lib?arith?IsZDFRE_st0
+dataconstructor http://www.gap-system.org/lib?arith?IsZDFRE_st1
+dataconstructor http://www.gap-system.org/lib?arith?IsZDFRE_st2
+dataconstructor http://www.gap-system.org/lib?arith?IsZDFRE_st3
+dataconstructor http://www.gap-system.org/lib?arith?IsZDFRE_st4
+dataconstructor http://www.gap-system.org/lib?arith?IsZDFRE_st5
+dataconstructor http://www.gap-system.org/lib?arith?IsZDFRE_st6
+dataconstructor http://www.gap-system.org/lib?arith?IsZDFRE_st7
+dataconstructor http://www.gap-system.org/lib?arith?IsZDFRE_st8
+dataconstructor http://www.gap-system.org/lib?arith?IsZDFRE_st9
+dataconstructor http://www.gap-system.org/lib?arith?IsAssociativeElement
+dataconstructor http://www.gap-system.org/lib?arith?IsAssociativeElement_st0
+dataconstructor http://www.gap-system.org/lib?arith?IsAssociativeElement_st1
+dataconstructor http://www.gap-system.org/lib?arith?IsAssociativeElement_st2
+dataconstructor http://www.gap-system.org/lib?arith?IsAdditivelyCommutativeElement
+dataconstructor http://www.gap-system.org/lib?arith?IsAdditivelyCommutativeElement_st0
+dataconstructor http://www.gap-system.org/lib?arith?IsAdditivelyCommutativeElement_st1
+dataconstructor http://www.gap-system.org/lib?arith?IsAdditivelyCommutativeElement_st2
+dataconstructor http://www.gap-system.org/lib?arith?IsCommutativeElement
+dataconstructor http://www.gap-system.org/lib?arith?IsCommutativeElement_st0
+dataconstructor http://www.gap-system.org/lib?arith?IsCommutativeElement_st1
+dataconstructor http://www.gap-system.org/lib?arith?IsCommutativeElement_st2
+dataconstructor http://www.gap-system.org/lib?arith?IsJacobianElement
+dataconstructor http://www.gap-system.org/lib?arith?IsJacobianElement_st0
+dataconstructor http://www.gap-system.org/lib?arith?IsJacobianElement_st1
+dataconstructor http://www.gap-system.org/lib?arith?IsJacobianElement_st2
+dataconstructor http://www.gap-system.org/lib?arith?IsJacobianElement_st3
+dataconstructor http://www.gap-system.org/lib?arith?IsJacobianElement_st4
+dataconstructor http://www.gap-system.org/lib?arith?IsJacobianElement_st5
+dataconstructor http://www.gap-system.org/lib?arith?IsJacobianElement_st6
+dataconstructor http://www.gap-system.org/lib?arith?IsJacobianElement_st7
+dataconstructor http://www.gap-system.org/lib?arith?IsRestrictedJacobianElement
+dataconstructor http://www.gap-system.org/lib?arith?IsRestrictedJacobianElement_st0
+dataconstructor http://www.gap-system.org/lib?arith?IsRestrictedJacobianElement_st1
+dataconstructor http://www.gap-system.org/lib?arith?IsRestrictedJacobianElement_st2
+dataconstructor http://www.gap-system.org/lib?arith?IsRestrictedJacobianElement_st3
+dataconstructor http://www.gap-system.org/lib?arith?IsRestrictedJacobianElement_st4
+dataconstructor http://www.gap-system.org/lib?arith?IsRestrictedJacobianElement_st5
+dataconstructor http://www.gap-system.org/lib?arith?IsRestrictedJacobianElement_st6
+dataconstructor http://www.gap-system.org/lib?arith?IsRestrictedJacobianElement_st7
+dataconstructor http://www.gap-system.org/lib?arith?IsRestrictedJacobianElement_st8
+dataconstructor http://www.gap-system.org/lib?arith?IsGeneralizedRowVector
+dataconstructor http://www.gap-system.org/lib?arith?IsGeneralizedRowVector_st0
+dataconstructor http://www.gap-system.org/lib?arith?IsGeneralizedRowVector_st1
+dataconstructor http://www.gap-system.org/lib?arith?IsGeneralizedRowVector_st2
+dataconstructor http://www.gap-system.org/lib?arith?IsGeneralizedRowVector_st3
+dataconstructor http://www.gap-system.org/lib?arith?IsGeneralizedRowVector_st4
+dataconstructor http://www.gap-system.org/lib?arith?IsGeneralizedRowVector_st5
+dataconstructor http://www.gap-system.org/lib?arith?IsGeneralizedRowVector_st6
+dataconstructor http://www.gap-system.org/lib?arith?IsOddAdditiveNestingDepthObject
+dataconstructor http://www.gap-system.org/lib?arith?IsMultiplicativeElementList
+dataconstructor http://www.gap-system.org/lib?arith?IsMultiplicativeElementWithInverseList
+dataconstructor http://www.gap-system.org/lib?arith?*
+dataconstructor http://www.gap-system.org/lib?arith?IsVector
+dataconstructor http://www.gap-system.org/lib?arith?InverseSameMutability
+dataconstructor http://www.gap-system.org/lib?arith?%2F
+dataconstructor http://www.gap-system.org/lib?arith?IsNearRingElementWithOne
+dataconstructor http://www.gap-system.org/lib?arith?IsMultiplicativeElementWithInverseTable
+dataconstructor http://www.gap-system.org/lib?arith?IsUFDFamily
+dataconstructor http://www.gap-system.org/lib?arith?IsFiniteOrderElement
+dataconstructor http://www.gap-system.org/lib?arith?IsFiniteOrderElement_st0
+dataconstructor http://www.gap-system.org/lib?arith?IsFiniteOrderElement_st1
+dataconstructor http://www.gap-system.org/lib?arith?IsFiniteOrderElement_st2
+dataconstructor http://www.gap-system.org/lib?arith?IsFiniteOrderElement_st3
+dataconstructor http://www.gap-system.org/lib?arith?IsFiniteOrderElement_st4
+dataconstructor http://www.gap-system.org/lib?arith?IsIdempotent
+dataconstructor http://www.gap-system.org/lib?arith?Characteristic
+dataconstructor http://www.gap-system.org/lib?arith?Comm
+dataconstructor http://www.gap-system.org/lib?arith?IsRingElementList
+dataconstructor http://www.gap-system.org/lib?arith?IsAdditiveElementWithInverseCollColl
+dataconstructor http://www.gap-system.org/lib?arith?IsExtLElementList
+dataconstructor http://www.gap-system.org/lib?arith?IsMultiplicativeGeneralizedRowVector
+dataconstructor http://www.gap-system.org/lib?arith?IsMultiplicativeGeneralizedRowVector_st0
+dataconstructor http://www.gap-system.org/lib?arith?IsMultiplicativeGeneralizedRowVector_st1
+dataconstructor http://www.gap-system.org/lib?arith?IsMultiplicativeGeneralizedRowVector_st2
+dataconstructor http://www.gap-system.org/lib?arith?IsMultiplicativeGeneralizedRowVector_st3
+dataconstructor http://www.gap-system.org/lib?arith?IsMultiplicativeGeneralizedRowVector_st4
+dataconstructor http://www.gap-system.org/lib?arith?IsMultiplicativeGeneralizedRowVector_st5
+dataconstructor http://www.gap-system.org/lib?arith?IsMultiplicativeGeneralizedRowVector_st6
+dataconstructor http://www.gap-system.org/lib?arith?IsMultiplicativeGeneralizedRowVector_st7
+dataconstructor http://www.gap-system.org/lib?arith?ZeroSameMutability
+dataconstructor http://www.gap-system.org/lib?arith?IsZero
+dataconstructor http://www.gap-system.org/lib?arith?IsRingElementWithOneCollCollColl
+dataconstructor http://www.gap-system.org/lib?arith?IsOrdinaryMatrix
+dataconstructor http://www.gap-system.org/lib?arith?IsOrdinaryMatrix_st0
+dataconstructor http://www.gap-system.org/lib?arith?IsOrdinaryMatrix_st1
+dataconstructor http://www.gap-system.org/lib?arith?IsOrdinaryMatrix_st2
+dataconstructor http://www.gap-system.org/lib?arith?IsOrdinaryMatrix_st3
+dataconstructor http://www.gap-system.org/lib?arith?IsOrdinaryMatrix_st4
+dataconstructor http://www.gap-system.org/lib?arith?IsOrdinaryMatrix_st5
+dataconstructor http://www.gap-system.org/lib?arith?IsOrdinaryMatrix_st6
+dataconstructor http://www.gap-system.org/lib?arith?IsOrdinaryMatrix_st7
+dataconstructor http://www.gap-system.org/lib?arith?IsOrdinaryMatrix_st8
+dataconstructor http://www.gap-system.org/lib?arith?IsOrdinaryMatrix_st9
+dataconstructor http://www.gap-system.org/lib?arith?IsOrdinaryMatrix_st10
+dataconstructor http://www.gap-system.org/lib?arith?IsOrdinaryMatrix_st11
+dataconstructor http://www.gap-system.org/lib?arith?IsOrdinaryMatrix_st12
+dataconstructor http://www.gap-system.org/lib?arith?IsOrdinaryMatrix_st13
+dataconstructor http://www.gap-system.org/lib?arith?IsOrdinaryMatrix_st14
+dataconstructor http://www.gap-system.org/lib?arith?IsOrdinaryMatrix_st15
+dataconstructor http://www.gap-system.org/lib?arith?IsOrdinaryMatrix_st16
+dataconstructor http://www.gap-system.org/lib?arith?IsOrdinaryMatrix_st17
+dataconstructor http://www.gap-system.org/lib?arith?IsOrdinaryMatrix_st18
+dataconstructor http://www.gap-system.org/lib?arith?IsOrdinaryMatrix_st19
+dataconstructor http://www.gap-system.org/lib?arith?IsOrdinaryMatrix_st20
+dataconstructor http://www.gap-system.org/lib?arith?IsOrdinaryMatrix_st21
+dataconstructor http://www.gap-system.org/lib?arith?IsOrdinaryMatrix_st22
+dataconstructor http://www.gap-system.org/lib?arith?IsOrdinaryMatrix_st23
+dataconstructor http://www.gap-system.org/lib?arith?IsOrdinaryMatrix_st24
+dataconstructor http://www.gap-system.org/lib?arith?IsOrdinaryMatrix_st25
+dataconstructor http://www.gap-system.org/lib?arith?IsOrdinaryMatrix_st26
+dataconstructor http://www.gap-system.org/lib?arith?IsOrdinaryMatrix_st27
+dataconstructor http://www.gap-system.org/lib?arith?IsOrdinaryMatrix_st28
+dataconstructor http://www.gap-system.org/lib?arith?IsOrdinaryMatrix_st29
+dataconstructor http://www.gap-system.org/lib?arith?IsOrdinaryMatrix_st30
+dataconstructor http://www.gap-system.org/lib?arith?IsMultiplicativeElementTable
+dataconstructor http://www.gap-system.org/lib?arith?IsNearRingElementWithInverseCollColl
+dataconstructor http://www.gap-system.org/lib?arith?IsAdditiveElementWithInverseCollCollColl
+dataconstructor http://www.gap-system.org/lib?arith?IsNearRingElementCollCollColl
+dataconstructor http://www.gap-system.org/lib?arith?IsZeroSquaredElement
+dataconstructor http://www.gap-system.org/lib?arith?IsZeroSquaredElement_st0
+dataconstructor http://www.gap-system.org/lib?arith?IsZeroSquaredElement_st1
+dataconstructor http://www.gap-system.org/lib?arith?IsZeroSquaredElement_st2
+dataconstructor http://www.gap-system.org/lib?arith?IsZeroSquaredElement_st3
+dataconstructor http://www.gap-system.org/lib?arith?IsZeroSquaredElement_st4
+dataconstructor http://www.gap-system.org/lib?arith?IsZeroSquaredElement_st5
+dataconstructor http://www.gap-system.org/lib?arith?IsZeroSquaredElement_st6
+dataconstructor http://www.gap-system.org/lib?arith?IsZeroSquaredElement_st7
+dataconstructor http://www.gap-system.org/lib?arith?IsExtRElementTable
+dataconstructor http://www.gap-system.org/lib?arith?IsMatrix
+dataconstructor http://www.gap-system.org/lib?arith?IsCommutativeFamily
+dataconstructor http://www.gap-system.org/lib?arith?IsNearRingElementWithOneCollCollColl
+dataconstructor http://www.gap-system.org/lib?arith?IsExtAElementTable
+dataconstructor http://www.gap-system.org/lib?arith?IsAdditiveElementWithZeroCollCollColl
+dataconstructor http://www.gap-system.org/lib?arith?IsVectorTable
+dataconstructor http://www.gap-system.org/lib?arith?OneImmutable
+dataconstructor http://www.gap-system.org/lib?arith?NormedRowVector
+dataconstructor http://www.gap-system.org/lib?arith?IsNearRingElementCollection
+dataconstructor http://www.gap-system.org/lib?arith?IsAdditiveElementTable
+dataconstructor http://www.gap-system.org/lib?arith?IsRingElementWithInverseCollection
+dataconstructor http://www.gap-system.org/lib?arith?^
+dataconstructor http://www.gap-system.org/lib?arith?IsRingElementWithOneCollColl
+dataconstructor http://www.gap-system.org/lib?arith?NestingDepthM
+dataconstructor http://www.gap-system.org/lib?arith?IsNearRingElementFamily
+dataconstructor http://www.gap-system.org/lib?arith?IsNearRingElementFamily_st0
+dataconstructor http://www.gap-system.org/lib?arith?IsNearRingElementFamily_st1
+dataconstructor http://www.gap-system.org/lib?arith?AdditiveInverseImmutable
+dataconstructor http://www.gap-system.org/lib?arith?IsExtLElementTable
+dataconstructor http://www.gap-system.org/lib?arith?Int
+dataconstructor http://www.gap-system.org/lib?arith?IsRingElementWithOneList
+dataconstructor http://www.gap-system.org/lib?arith?IsNearRingElementList
+dataconstructor http://www.gap-system.org/lib?arith?IsNearAdditiveElementWithZeroList
+dataconstructor http://www.gap-system.org/lib?arith?IsVectorCollColl
+dataconstructor http://www.gap-system.org/lib?arith?AdditiveInverseMutable
+dataconstructor http://www.gap-system.org/lib?arith?IsRingElementCollColl
+dataconstructor http://www.gap-system.org/lib?arith?IsNearRingElementWithInverseList
+dataconstructor http://www.gap-system.org/lib?arith?NestingDepthA
+dataconstructor http://www.gap-system.org/lib?arith?IsAdditiveElementWithZeroCollection
+dataconstructor http://www.gap-system.org/lib?arith?IsNearAdditiveElementTable
+dataconstructor http://www.gap-system.org/lib?arith?IsVectorCollection
+dataconstructor http://www.gap-system.org/lib?arith?Sqrt
+dataconstructor http://www.gap-system.org/lib?arith?IsRingElementWithInverse
+dataconstructor http://www.gap-system.org/lib?arith?LieBracket
+dataconstructor http://www.gap-system.org/lib?arith?IsRingElementWithOneTable
+dataconstructor http://www.gap-system.org/lib?arith?IsNearAdditiveElementWithZeroTable
+dataconstructor http://www.gap-system.org/lib?arith?IsAdditiveElementList
+dataconstructor http://www.gap-system.org/lib?arith?IsNearAdditiveElementList
+dataconstructor http://www.gap-system.org/lib?arith?IsAdditiveElementWithZero
+dataconstructor http://www.gap-system.org/lib?arith?LeftQuotient
+dataconstructor http://www.gap-system.org/lib?arith?InverseImmutable
+dataconstructor http://www.gap-system.org/lib?arith?InverseMutable
+dataconstructor http://www.gap-system.org/lib?arith?IsRowVector
+dataconstructor http://www.gap-system.org/lib?arith?Order
+dataconstructor http://www.gap-system.org/lib?arith?IsNearRingElementCollColl
+dataconstructor http://www.gap-system.org/lib?arith?IsMultiplicativeElementWithOneList
+dataconstructor http://www.gap-system.org/lib?arith?OneMutable
+dataconstructor http://www.gap-system.org/lib?arith?Rat
+dataconstructor http://www.gap-system.org/lib?arith?AdditiveInverseSameMutability
+dataconstructor http://www.gap-system.org/lib?arith?mod
+dataconstructor http://www.gap-system.org/lib?arith?IsMultiplicativeElementWithOneTable
+dataconstructor http://www.gap-system.org/lib?arith?IsRingElementWithInverseTable
+dataconstructor http://www.gap-system.org/lib?arith?UnderlyingElement
+dataconstructor http://www.gap-system.org/lib?arith?IsRingElementCollCollColl
+dataconstructor http://www.gap-system.org/lib?arith?IsAdditiveElementWithInverseList
+dataconstructor http://www.gap-system.org/lib?arith?IsLieMatrix
+dataconstructor http://www.gap-system.org/lib?arith?IsLieMatrix_st0
+dataconstructor http://www.gap-system.org/lib?arith?IsLieMatrix_st1
+dataconstructor http://www.gap-system.org/lib?arith?IsLieMatrix_st2
+dataconstructor http://www.gap-system.org/lib?arith?IsLieMatrix_st3
+dataconstructor http://www.gap-system.org/lib?arith?IsLieMatrix_st4
+dataconstructor http://www.gap-system.org/lib?arith?IsLieMatrix_st5
+dataconstructor http://www.gap-system.org/lib?arith?IsLieMatrix_st6
+dataconstructor http://www.gap-system.org/lib?arith?IsLieMatrix_st7
+dataconstructor http://www.gap-system.org/lib?arith?IsLieMatrix_st8
+dataconstructor http://www.gap-system.org/lib?arith?IsLieMatrix_st9
+dataconstructor http://www.gap-system.org/lib?arith?IsLieMatrix_st10
+dataconstructor http://www.gap-system.org/lib?arith?IsLieMatrix_st11
+dataconstructor http://www.gap-system.org/lib?arith?IsLieMatrix_st12
+dataconstructor http://www.gap-system.org/lib?arith?IsLieMatrix_st13
+dataconstructor http://www.gap-system.org/lib?arith?IsLieMatrix_st14
+dataconstructor http://www.gap-system.org/lib?arith?IsLieMatrix_st15
+dataconstructor http://www.gap-system.org/lib?arith?IsLieMatrix_st16
+dataconstructor http://www.gap-system.org/lib?arith?IsLieMatrix_st17
+dataconstructor http://www.gap-system.org/lib?arith?IsLieMatrix_st18
+dataconstructor http://www.gap-system.org/lib?arith?IsLieMatrix_st19
+dataconstructor http://www.gap-system.org/lib?arith?IsLieMatrix_st20
+dataconstructor http://www.gap-system.org/lib?arith?IsLieMatrix_st21
+dataconstructor http://www.gap-system.org/lib?arith?IsLieMatrix_st22
+dataconstructor http://www.gap-system.org/lib?arith?IsLieMatrix_st23
+dataconstructor http://www.gap-system.org/lib?arith?IsLieMatrix_st24
+dataconstructor http://www.gap-system.org/lib?arith?IsLieMatrix_st25
+dataconstructor http://www.gap-system.org/lib?arith?IsLieMatrix_st26
+dataconstructor http://www.gap-system.org/lib?arith?IsLieMatrix_st27
+dataconstructor http://www.gap-system.org/lib?arith?IsLieMatrix_st28
+dataconstructor http://www.gap-system.org/lib?arith?IsLieMatrix_st29
+dataconstructor http://www.gap-system.org/lib?arith?IsRingElementWithInverseCollColl
+dataconstructor http://www.gap-system.org/lib?arith?IsRingElementFamily
+dataconstructor http://www.gap-system.org/lib?arith?IsRingElementFamily_st0
+dataconstructor http://www.gap-system.org/lib?arith?IsRingElementFamily_st1
+dataconstructor http://www.gap-system.org/lib?arith?IsRingElementFamily_st2
+dataconstructor http://www.gap-system.org/lib?arith?IsSkewFieldFamily
+dataconstructor http://www.gap-system.org/lib?arith?IsRingElementWithOneCollection
+dataconstructor http://www.gap-system.org/lib?arith?IsAdditiveElementWithInverseTable
+dataconstructor http://www.gap-system.org/lib?arith?IsNearRingElement
+dataconstructor http://www.gap-system.org/lib?arith?IsNearRingElementWithOneCollection
+dataconstructor http://www.gap-system.org/lib?arith?IsNearRingElementWithOneTable
+dataconstructor http://www.gap-system.org/lib?arith?AdditiveElementAsMultiplicativeElement
+dataconstructor http://www.gap-system.org/lib?arith?IsExtAElementList
+dataconstructor http://www.gap-system.org/lib?arith?IsRingElementCollection
+dataconstructor http://www.gap-system.org/lib?arith?IsVectorList
+dataconstructor http://www.gap-system.org/lib?arith?IsAdditiveElementWithInverseCollection
+dataconstructor http://www.gap-system.org/lib?arith?+
+dataconstructor http://www.gap-system.org/lib?arith?IsNearRingElementWithOneList
+dataconstructor http://www.gap-system.org/lib?arith?IsMatrixCollection
+dataconstructor http://www.gap-system.org/lib?arith?IsMatrixCollection_st0
+dataconstructor http://www.gap-system.org/lib?arith?IsMatrixCollection_st1
+dataconstructor http://www.gap-system.org/lib?arith?IsMatrixCollection_st2
+dataconstructor http://www.gap-system.org/lib?arith?IsMatrixCollection_st3
+dataconstructor http://www.gap-system.org/lib?arith?IsMatrixCollection_st4
+dataconstructor http://www.gap-system.org/lib?arith?IsMatrixCollection_st5
+dataconstructor http://www.gap-system.org/lib?arith?IsMatrixCollection_st6
+dataconstructor http://www.gap-system.org/lib?arith?IsMatrixCollection_st7
+dataconstructor http://www.gap-system.org/lib?arith?IsMatrixCollection_st8
+dataconstructor http://www.gap-system.org/lib?arith?IsMatrixCollection_st9
+dataconstructor http://www.gap-system.org/lib?arith?IsMatrixCollection_st10
+dataconstructor http://www.gap-system.org/lib?arith?IsMatrixCollection_st11
+dataconstructor http://www.gap-system.org/lib?arith?IsMatrixCollection_st12
+dataconstructor http://www.gap-system.org/lib?arith?IsMatrixCollection_st13
+dataconstructor http://www.gap-system.org/lib?arith?IsMatrixCollection_st14
+dataconstructor http://www.gap-system.org/lib?arith?IsMatrixCollection_st15
+dataconstructor http://www.gap-system.org/lib?arith?IsMatrixCollection_st16
+dataconstructor http://www.gap-system.org/lib?arith?IsMatrixCollection_st17
+dataconstructor http://www.gap-system.org/lib?arith?IsMatrixCollection_st18
+dataconstructor http://www.gap-system.org/lib?arith?IsMatrixCollection_st19
+dataconstructor http://www.gap-system.org/lib?arith?IsMatrixCollection_st20
+dataconstructor http://www.gap-system.org/lib?arith?IsMatrixCollection_st21
+dataconstructor http://www.gap-system.org/lib?arith?IsMatrixCollection_st22
+dataconstructor http://www.gap-system.org/lib?arith?IsMatrixCollection_st23
+dataconstructor http://www.gap-system.org/lib?arith?IsMatrixCollection_st24
+dataconstructor http://www.gap-system.org/lib?arith?IsMatrixCollection_st25
+dataconstructor http://www.gap-system.org/lib?arith?-
+dataconstructor http://www.gap-system.org/lib?arith?IsRingElementWithInverseList
+dataconstructor http://www.gap-system.org/lib?arith?AdditiveElementsAsMultiplicativeElementsFamily
+dataconstructor http://www.gap-system.org/lib?arith?IsNearRingElementTable
+dataconstructor http://www.gap-system.org/lib?arith?Log
+dataconstructor http://www.gap-system.org/lib?arith?OneSameMutability
+dataconstructor http://www.gap-system.org/lib?arith?IsRingElementWithInverseCollCollColl
+dataconstructor http://www.gap-system.org/lib?arith?IsOne
+dataconstructor http://www.gap-system.org/lib?arith?IsAdditiveElementWithZeroTable
+dataconstructor http://www.gap-system.org/lib?arith?ZeroImmutable
+dataconstructor http://www.gap-system.org/lib?arith?IsNearRingElementWithInverseCollection
+dataconstructor http://www.gap-system.org/lib?arith?IsNearRingElementWithInverse
+dataconstructor http://www.gap-system.org/lib?arith?ZeroMutable
+dataconstructor http://www.gap-system.org/lib?arith?IsNearRingElementWithInverseCollCollColl
+dataconstructor http://www.gap-system.org/lib?arith?Root
+dataconstructor http://www.gap-system.org/lib?arith?IsNearAdditiveElementWithInverseList
+dataconstructor http://www.gap-system.org/lib?arith?IsExtRElementList
+dataconstructor http://www.gap-system.org/lib?arith?IsNearAdditiveElementWithInverseTable
+dataconstructor http://www.gap-system.org/lib?arith?IsRingElement
+dataconstructor http://www.gap-system.org/lib?arith?IsAdditiveElementWithInverse
+dataconstructor http://www.gap-system.org/lib?arith?IsAdditiveElementWithZeroList
+dataconstructor http://www.gap-system.org/lib?arith?IsAdditiveElementAsMultiplicativeElementRep
+dataconstructor http://www.gap-system.org/lib?arith?IsAdditiveElementAsMultiplicativeElementRep_st0
+dataconstructor http://www.gap-system.org/lib?arith?IsAdditiveElementAsMultiplicativeElementRep_st1
+dataconstructor http://www.gap-system.org/lib?arith?IsAdditiveElementAsMultiplicativeElementRep_st2
+dataconstructor http://www.gap-system.org/lib?arith?IsAdditiveElementAsMultiplicativeElementRep_st3
+dataconstructor http://www.gap-system.org/lib?arith?IsRingElementWithOne
+dataconstructor http://www.gap-system.org/lib?arith?IsOddAdditiveNestingDepthFamily
+dataconstructor http://www.gap-system.org/lib?arith?IsNearRingElementWithOneCollColl
+dataconstructor http://www.gap-system.org/lib?arith?IsAdditiveElementWithZeroCollColl
+dataconstructor http://www.gap-system.org/lib?arith?IsNearRingElementWithInverseTable
 theory http://www.gap-system.org/lib?arith
 HasMeta http://www.gap-system.org/lib?arith http://www.gap-system.org/?Types
 Declares http://www.gap-system.org/lib?arith http://www.gap-system.org/lib?arith?IsExtAElement
 constant http://www.gap-system.org/lib?arith?IsExtAElement
-Includes http://www.gap-system.org/lib?arith http://www.gap-system.org/lib?arith
 Declares http://www.gap-system.org/lib?arith http://www.gap-system.org/lib?arith?IsNearAdditiveElement
 constant http://www.gap-system.org/lib?arith?IsNearAdditiveElement
 Declares http://www.gap-system.org/lib?arith http://www.gap-system.org/lib?arith?IsNearAdditiveElement_st0
diff --git a/relational/http..www.gap-system.org/lib/basis.rel b/relational/http..www.gap-system.org/lib/basis.rel
index 79c826cf46b82a29fabe9a47f192efad8d0af6e0..f91443f80f4c6ada034c29db46467a1a991ad660 100644
--- a/relational/http..www.gap-system.org/lib/basis.rel
+++ b/relational/http..www.gap-system.org/lib/basis.rel
@@ -140,6 +140,112 @@ implies http://www.gap-system.org/lib?basis?RelativeBasisNC http://www.gap-syste
 IsAttribute http://www.gap-system.org/lib?basis?RelativeBasis
 implies http://www.gap-system.org/lib?basis?RelativeBasis http://www.gap-system.org/lib?basis?IsBasis
 implies http://www.gap-system.org/lib?basis?RelativeBasis http://www.gap-system.org/lib?list?IsHomogeneousList
+dataconstructor http://www.gap-system.org/lib?basis?UglyVector
+dataconstructor http://www.gap-system.org/lib?basis?IsBasis
+dataconstructor http://www.gap-system.org/lib?basis?IsBasis_st0
+dataconstructor http://www.gap-system.org/lib?basis?IsBasis_st1
+dataconstructor http://www.gap-system.org/lib?basis?IsBasis_st2
+dataconstructor http://www.gap-system.org/lib?basis?IsBasis_st3
+dataconstructor http://www.gap-system.org/lib?basis?IsBasis_st4
+dataconstructor http://www.gap-system.org/lib?basis?IsBasis_st5
+dataconstructor http://www.gap-system.org/lib?basis?BasisVectors
+dataconstructor http://www.gap-system.org/lib?basis?IsSemiEchelonized
+dataconstructor http://www.gap-system.org/lib?basis?SemiEchelonBasis
+dataconstructor http://www.gap-system.org/lib?basis?IsBasisByNiceBasis
+dataconstructor http://www.gap-system.org/lib?basis?IsBasisByNiceBasis_st0
+dataconstructor http://www.gap-system.org/lib?basis?IsBasisByNiceBasis_st1
+dataconstructor http://www.gap-system.org/lib?basis?IsBasisByNiceBasis_st2
+dataconstructor http://www.gap-system.org/lib?basis?IsBasisByNiceBasis_st3
+dataconstructor http://www.gap-system.org/lib?basis?IsBasisByNiceBasis_st4
+dataconstructor http://www.gap-system.org/lib?basis?IsBasisByNiceBasis_st5
+dataconstructor http://www.gap-system.org/lib?basis?IsBasisByNiceBasis_st6
+dataconstructor http://www.gap-system.org/lib?basis?IsBasisByNiceBasis_st7
+dataconstructor http://www.gap-system.org/lib?basis?IsBasisByNiceBasis_st8
+dataconstructor http://www.gap-system.org/lib?basis?IsBasisByNiceBasis_st9
+dataconstructor http://www.gap-system.org/lib?basis?IsBasisByNiceBasis_st10
+dataconstructor http://www.gap-system.org/lib?basis?NiceBasisNC
+dataconstructor http://www.gap-system.org/lib?basis?Basis
+dataconstructor http://www.gap-system.org/lib?basis?IteratorByBasis
+dataconstructor http://www.gap-system.org/lib?basis?NiceFreeLeftModule
+dataconstructor http://www.gap-system.org/lib?basis?IsBasisWithReplacedLeftModuleRep
+dataconstructor http://www.gap-system.org/lib?basis?IsBasisWithReplacedLeftModuleRep_st0
+dataconstructor http://www.gap-system.org/lib?basis?IsBasisWithReplacedLeftModuleRep_st1
+dataconstructor http://www.gap-system.org/lib?basis?IsGenericFiniteSpace
+dataconstructor http://www.gap-system.org/lib?basis?IsGenericFiniteSpace_st0
+dataconstructor http://www.gap-system.org/lib?basis?IsGenericFiniteSpace_st1
+dataconstructor http://www.gap-system.org/lib?basis?IsGenericFiniteSpace_st2
+dataconstructor http://www.gap-system.org/lib?basis?IsGenericFiniteSpace_st3
+dataconstructor http://www.gap-system.org/lib?basis?IsGenericFiniteSpace_st4
+dataconstructor http://www.gap-system.org/lib?basis?IsGenericFiniteSpace_st5
+dataconstructor http://www.gap-system.org/lib?basis?IsGenericFiniteSpace_st6
+dataconstructor http://www.gap-system.org/lib?basis?IsGenericFiniteSpace_st7
+dataconstructor http://www.gap-system.org/lib?basis?IsGenericFiniteSpace_st8
+dataconstructor http://www.gap-system.org/lib?basis?IsGenericFiniteSpace_st9
+dataconstructor http://www.gap-system.org/lib?basis?IsGenericFiniteSpace_st10
+dataconstructor http://www.gap-system.org/lib?basis?IsGenericFiniteSpace_st11
+dataconstructor http://www.gap-system.org/lib?basis?IsGenericFiniteSpace_st12
+dataconstructor http://www.gap-system.org/lib?basis?IsGenericFiniteSpace_st13
+dataconstructor http://www.gap-system.org/lib?basis?IsGenericFiniteSpace_st14
+dataconstructor http://www.gap-system.org/lib?basis?IsGenericFiniteSpace_st15
+dataconstructor http://www.gap-system.org/lib?basis?IsGenericFiniteSpace_st16
+dataconstructor http://www.gap-system.org/lib?basis?IsGenericFiniteSpace_st17
+dataconstructor http://www.gap-system.org/lib?basis?IsGenericFiniteSpace_st18
+dataconstructor http://www.gap-system.org/lib?basis?IsGenericFiniteSpace_st19
+dataconstructor http://www.gap-system.org/lib?basis?IsGenericFiniteSpace_st20
+dataconstructor http://www.gap-system.org/lib?basis?IsGenericFiniteSpace_st21
+dataconstructor http://www.gap-system.org/lib?basis?IsGenericFiniteSpace_st22
+dataconstructor http://www.gap-system.org/lib?basis?IsGenericFiniteSpace_st23
+dataconstructor http://www.gap-system.org/lib?basis?IsGenericFiniteSpace_st24
+dataconstructor http://www.gap-system.org/lib?basis?IsGenericFiniteSpace_st25
+dataconstructor http://www.gap-system.org/lib?basis?EnumeratorByBasis
+dataconstructor http://www.gap-system.org/lib?basis?IsIntegralBasis
+dataconstructor http://www.gap-system.org/lib?basis?IsRelativeBasisDefaultRep
+dataconstructor http://www.gap-system.org/lib?basis?IsRelativeBasisDefaultRep_st0
+dataconstructor http://www.gap-system.org/lib?basis?IsRelativeBasisDefaultRep_st1
+dataconstructor http://www.gap-system.org/lib?basis?BasisNC
+dataconstructor http://www.gap-system.org/lib?basis?IsCanonicalBasis
+dataconstructor http://www.gap-system.org/lib?basis?IsCanonicalBasisFullMatrixModule
+dataconstructor http://www.gap-system.org/lib?basis?NiceFreeLeftModuleInfo
+dataconstructor http://www.gap-system.org/lib?basis?SiftedVector
+dataconstructor http://www.gap-system.org/lib?basis?Coefficients
+dataconstructor http://www.gap-system.org/lib?basis?IsCanonicalBasisFullRowModule
+dataconstructor http://www.gap-system.org/lib?basis?IsFiniteBasisDefault
+dataconstructor http://www.gap-system.org/lib?basis?IsSpaceOfRationalFunctions
+dataconstructor http://www.gap-system.org/lib?basis?IsSpaceOfRationalFunctions_st0
+dataconstructor http://www.gap-system.org/lib?basis?IsSpaceOfRationalFunctions_st1
+dataconstructor http://www.gap-system.org/lib?basis?IsSpaceOfRationalFunctions_st2
+dataconstructor http://www.gap-system.org/lib?basis?IsSpaceOfRationalFunctions_st3
+dataconstructor http://www.gap-system.org/lib?basis?IsSpaceOfRationalFunctions_st4
+dataconstructor http://www.gap-system.org/lib?basis?IsSpaceOfRationalFunctions_st5
+dataconstructor http://www.gap-system.org/lib?basis?IsSpaceOfRationalFunctions_st6
+dataconstructor http://www.gap-system.org/lib?basis?IsSpaceOfRationalFunctions_st7
+dataconstructor http://www.gap-system.org/lib?basis?IsSpaceOfRationalFunctions_st8
+dataconstructor http://www.gap-system.org/lib?basis?IsSpaceOfRationalFunctions_st9
+dataconstructor http://www.gap-system.org/lib?basis?IsSpaceOfRationalFunctions_st10
+dataconstructor http://www.gap-system.org/lib?basis?IsSpaceOfRationalFunctions_st11
+dataconstructor http://www.gap-system.org/lib?basis?IsSpaceOfRationalFunctions_st12
+dataconstructor http://www.gap-system.org/lib?basis?IsSpaceOfRationalFunctions_st13
+dataconstructor http://www.gap-system.org/lib?basis?IsSpaceOfRationalFunctions_st14
+dataconstructor http://www.gap-system.org/lib?basis?IsSpaceOfRationalFunctions_st15
+dataconstructor http://www.gap-system.org/lib?basis?IsSpaceOfRationalFunctions_st16
+dataconstructor http://www.gap-system.org/lib?basis?IsSpaceOfRationalFunctions_st17
+dataconstructor http://www.gap-system.org/lib?basis?IsSpaceOfRationalFunctions_st18
+dataconstructor http://www.gap-system.org/lib?basis?IsSpaceOfRationalFunctions_st19
+dataconstructor http://www.gap-system.org/lib?basis?IsSpaceOfRationalFunctions_st20
+dataconstructor http://www.gap-system.org/lib?basis?IsSpaceOfRationalFunctions_st21
+dataconstructor http://www.gap-system.org/lib?basis?IsSpaceOfRationalFunctions_st22
+dataconstructor http://www.gap-system.org/lib?basis?IsSpaceOfRationalFunctions_st23
+dataconstructor http://www.gap-system.org/lib?basis?IsSpaceOfRationalFunctions_st24
+dataconstructor http://www.gap-system.org/lib?basis?IsSpaceOfRationalFunctions_st25
+dataconstructor http://www.gap-system.org/lib?basis?NiceVector
+dataconstructor http://www.gap-system.org/lib?basis?StructureConstantsTable
+dataconstructor http://www.gap-system.org/lib?basis?NiceBasis
+dataconstructor http://www.gap-system.org/lib?basis?UnderlyingLeftModule
+dataconstructor http://www.gap-system.org/lib?basis?IsNormalBasis
+dataconstructor http://www.gap-system.org/lib?basis?SemiEchelonBasisNC
+dataconstructor http://www.gap-system.org/lib?basis?LinearCombination
+dataconstructor http://www.gap-system.org/lib?basis?RelativeBasisNC
+dataconstructor http://www.gap-system.org/lib?basis?RelativeBasis
 theory http://www.gap-system.org/lib?basis
 HasMeta http://www.gap-system.org/lib?basis http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?basis http://www.gap-system.org/lib?module
@@ -161,7 +267,6 @@ Declares http://www.gap-system.org/lib?basis http://www.gap-system.org/lib?basis
 constant http://www.gap-system.org/lib?basis?IsBasis_st4
 Declares http://www.gap-system.org/lib?basis http://www.gap-system.org/lib?basis?IsBasis_st5
 constant http://www.gap-system.org/lib?basis?IsBasis_st5
-Includes http://www.gap-system.org/lib?basis http://www.gap-system.org/lib?basis
 Declares http://www.gap-system.org/lib?basis http://www.gap-system.org/lib?basis?BasisVectors
 constant http://www.gap-system.org/lib?basis?BasisVectors
 Declares http://www.gap-system.org/lib?basis http://www.gap-system.org/lib?basis?IsSemiEchelonized
diff --git a/relational/http..www.gap-system.org/lib/basismut.rel b/relational/http..www.gap-system.org/lib/basismut.rel
index 751b4a146fd79e8b74f4ac70fa12e8a822054fe2..a998d33188e9a1c893703d82a3bd7c00e31d3b3a 100644
--- a/relational/http..www.gap-system.org/lib/basismut.rel
+++ b/relational/http..www.gap-system.org/lib/basismut.rel
@@ -29,11 +29,20 @@ implies http://www.gap-system.org/lib?basismut?MutableBasis http://www.gap-syste
 implies http://www.gap-system.org/lib?basismut?MutableBasis http://www.gap-system.org/lib?coll?IsCollection
 IsFilter http://www.gap-system.org/lib?basismut?IsMutableBasisByImmutableBasisRep
 implies http://www.gap-system.org/lib?basismut?IsMutableBasisByImmutableBasisRep_st0 http://www.gap-system.org/lib?type?IsComponentObjectRep
+dataconstructor http://www.gap-system.org/lib?basismut?IsMutableBasis
+dataconstructor http://www.gap-system.org/lib?basismut?IsContainedInSpan
+dataconstructor http://www.gap-system.org/lib?basismut?NrBasisVectors
+dataconstructor http://www.gap-system.org/lib?basismut?ImmutableBasis
+dataconstructor http://www.gap-system.org/lib?basismut?IsMutableBasisViaNiceMutableBasisRep
+dataconstructor http://www.gap-system.org/lib?basismut?IsMutableBasisViaNiceMutableBasisRep_st0
+dataconstructor http://www.gap-system.org/lib?basismut?CloseMutableBasis
+dataconstructor http://www.gap-system.org/lib?basismut?MutableBasis
+dataconstructor http://www.gap-system.org/lib?basismut?IsMutableBasisByImmutableBasisRep
+dataconstructor http://www.gap-system.org/lib?basismut?IsMutableBasisByImmutableBasisRep_st0
 theory http://www.gap-system.org/lib?basismut
 HasMeta http://www.gap-system.org/lib?basismut http://www.gap-system.org/?Types
 Declares http://www.gap-system.org/lib?basismut http://www.gap-system.org/lib?basismut?IsMutableBasis
 constant http://www.gap-system.org/lib?basismut?IsMutableBasis
-Includes http://www.gap-system.org/lib?basismut http://www.gap-system.org/lib?basismut
 Includes http://www.gap-system.org/lib?basismut http://www.gap-system.org/lib?arith
 Declares http://www.gap-system.org/lib?basismut http://www.gap-system.org/lib?basismut?IsContainedInSpan
 constant http://www.gap-system.org/lib?basismut?IsContainedInSpan
diff --git a/relational/http..www.gap-system.org/lib/clas.rel b/relational/http..www.gap-system.org/lib/clas.rel
index cb2c08752bf01d2e8cc908a419631e92b2ff4904..de25b4359466843d88baae2451f1c53a9c53b28c 100644
--- a/relational/http..www.gap-system.org/lib/clas.rel
+++ b/relational/http..www.gap-system.org/lib/clas.rel
@@ -57,6 +57,67 @@ implies http://www.gap-system.org/lib?clas?IsConjugacyClassPermGroupRep_st11 htt
 implies http://www.gap-system.org/lib?clas?IsConjugacyClassPermGroupRep_st11 http://www.gap-system.org/lib?oprt?IsExternalOrbit
 implies http://www.gap-system.org/lib?clas?IsConjugacyClassPermGroupRep_st11 http://www.gap-system.org/lib?clas?IsExternalOrbitByStabilizerRep
 implies http://www.gap-system.org/lib?clas?IsConjugacyClassPermGroupRep_st11 http://www.gap-system.org/lib?clas?IsConjugacyClassGroupRep
+dataconstructor http://www.gap-system.org/lib?clas?IsRationalClassGroupRep
+dataconstructor http://www.gap-system.org/lib?clas?IsRationalClassGroupRep_st0
+dataconstructor http://www.gap-system.org/lib?clas?IsRationalClassGroupRep_st1
+dataconstructor http://www.gap-system.org/lib?clas?IsRationalClassGroupRep_st2
+dataconstructor http://www.gap-system.org/lib?clas?IsRationalClassGroupRep_st3
+dataconstructor http://www.gap-system.org/lib?clas?IsRationalClassGroupRep_st4
+dataconstructor http://www.gap-system.org/lib?clas?IsRationalClassGroupRep_st5
+dataconstructor http://www.gap-system.org/lib?clas?IsRationalClassGroupRep_st6
+dataconstructor http://www.gap-system.org/lib?clas?IsRationalClassGroupRep_st7
+dataconstructor http://www.gap-system.org/lib?clas?IsRationalClassGroupRep_st8
+dataconstructor http://www.gap-system.org/lib?clas?IsRationalClassGroupRep_st9
+dataconstructor http://www.gap-system.org/lib?clas?DecomposedRationalClass
+dataconstructor http://www.gap-system.org/lib?clas?IsConjugacyClassGroupRep
+dataconstructor http://www.gap-system.org/lib?clas?IsConjugacyClassGroupRep_st0
+dataconstructor http://www.gap-system.org/lib?clas?IsConjugacyClassGroupRep_st1
+dataconstructor http://www.gap-system.org/lib?clas?IsConjugacyClassGroupRep_st2
+dataconstructor http://www.gap-system.org/lib?clas?IsConjugacyClassGroupRep_st3
+dataconstructor http://www.gap-system.org/lib?clas?IsConjugacyClassGroupRep_st4
+dataconstructor http://www.gap-system.org/lib?clas?IsConjugacyClassGroupRep_st5
+dataconstructor http://www.gap-system.org/lib?clas?IsConjugacyClassGroupRep_st6
+dataconstructor http://www.gap-system.org/lib?clas?IsConjugacyClassGroupRep_st7
+dataconstructor http://www.gap-system.org/lib?clas?IsConjugacyClassGroupRep_st8
+dataconstructor http://www.gap-system.org/lib?clas?IsConjugacyClassGroupRep_st9
+dataconstructor http://www.gap-system.org/lib?clas?IsRationalClassPermGroupRep
+dataconstructor http://www.gap-system.org/lib?clas?IsRationalClassPermGroupRep_st0
+dataconstructor http://www.gap-system.org/lib?clas?IsRationalClassPermGroupRep_st1
+dataconstructor http://www.gap-system.org/lib?clas?IsRationalClassPermGroupRep_st2
+dataconstructor http://www.gap-system.org/lib?clas?IsRationalClassPermGroupRep_st3
+dataconstructor http://www.gap-system.org/lib?clas?IsRationalClassPermGroupRep_st4
+dataconstructor http://www.gap-system.org/lib?clas?IsRationalClassPermGroupRep_st5
+dataconstructor http://www.gap-system.org/lib?clas?IsRationalClassPermGroupRep_st6
+dataconstructor http://www.gap-system.org/lib?clas?IsRationalClassPermGroupRep_st7
+dataconstructor http://www.gap-system.org/lib?clas?IsRationalClassPermGroupRep_st8
+dataconstructor http://www.gap-system.org/lib?clas?IsRationalClassPermGroupRep_st9
+dataconstructor http://www.gap-system.org/lib?clas?IsRationalClassPermGroupRep_st10
+dataconstructor http://www.gap-system.org/lib?clas?IsExternalOrbitByStabilizerRep
+dataconstructor http://www.gap-system.org/lib?clas?IsExternalOrbitByStabilizerRep_st0
+dataconstructor http://www.gap-system.org/lib?clas?IsExternalOrbitByStabilizerRep_st1
+dataconstructor http://www.gap-system.org/lib?clas?IsExternalOrbitByStabilizerRep_st2
+dataconstructor http://www.gap-system.org/lib?clas?IsExternalOrbitByStabilizerRep_st3
+dataconstructor http://www.gap-system.org/lib?clas?IsExternalOrbitByStabilizerRep_st4
+dataconstructor http://www.gap-system.org/lib?clas?IsExternalOrbitByStabilizerRep_st5
+dataconstructor http://www.gap-system.org/lib?clas?IsExternalOrbitByStabilizerRep_st6
+dataconstructor http://www.gap-system.org/lib?clas?IsExternalOrbitByStabilizerRep_st7
+dataconstructor http://www.gap-system.org/lib?clas?IsExternalOrbitByStabilizerRep_st8
+dataconstructor http://www.gap-system.org/lib?clas?IsExternalOrbitByStabilizerRep_st9
+dataconstructor http://www.gap-system.org/lib?clas?ConjugacyClass
+dataconstructor http://www.gap-system.org/lib?clas?RationalClass
+dataconstructor http://www.gap-system.org/lib?clas?IsConjugacyClassPermGroupRep
+dataconstructor http://www.gap-system.org/lib?clas?IsConjugacyClassPermGroupRep_st0
+dataconstructor http://www.gap-system.org/lib?clas?IsConjugacyClassPermGroupRep_st1
+dataconstructor http://www.gap-system.org/lib?clas?IsConjugacyClassPermGroupRep_st2
+dataconstructor http://www.gap-system.org/lib?clas?IsConjugacyClassPermGroupRep_st3
+dataconstructor http://www.gap-system.org/lib?clas?IsConjugacyClassPermGroupRep_st4
+dataconstructor http://www.gap-system.org/lib?clas?IsConjugacyClassPermGroupRep_st5
+dataconstructor http://www.gap-system.org/lib?clas?IsConjugacyClassPermGroupRep_st6
+dataconstructor http://www.gap-system.org/lib?clas?IsConjugacyClassPermGroupRep_st7
+dataconstructor http://www.gap-system.org/lib?clas?IsConjugacyClassPermGroupRep_st8
+dataconstructor http://www.gap-system.org/lib?clas?IsConjugacyClassPermGroupRep_st9
+dataconstructor http://www.gap-system.org/lib?clas?IsConjugacyClassPermGroupRep_st10
+dataconstructor http://www.gap-system.org/lib?clas?IsConjugacyClassPermGroupRep_st11
 theory http://www.gap-system.org/lib?clas
 HasMeta http://www.gap-system.org/lib?clas http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?clas http://www.gap-system.org/lib?type
@@ -86,7 +147,6 @@ Declares http://www.gap-system.org/lib?clas http://www.gap-system.org/lib?clas?I
 constant http://www.gap-system.org/lib?clas?IsRationalClassGroupRep_st8
 Declares http://www.gap-system.org/lib?clas http://www.gap-system.org/lib?clas?IsRationalClassGroupRep_st9
 constant http://www.gap-system.org/lib?clas?IsRationalClassGroupRep_st9
-Includes http://www.gap-system.org/lib?clas http://www.gap-system.org/lib?clas
 Declares http://www.gap-system.org/lib?clas http://www.gap-system.org/lib?clas?DecomposedRationalClass
 constant http://www.gap-system.org/lib?clas?DecomposedRationalClass
 Declares http://www.gap-system.org/lib?clas http://www.gap-system.org/lib?clas?IsConjugacyClassGroupRep
diff --git a/relational/http..www.gap-system.org/lib/coll.rel b/relational/http..www.gap-system.org/lib/coll.rel
index daea59b4798d464de015725279aca86ab896d0fc..643eb04e777be8312e7513ee968bea91b0c1ab7c 100644
--- a/relational/http..www.gap-system.org/lib/coll.rel
+++ b/relational/http..www.gap-system.org/lib/coll.rel
@@ -121,11 +121,69 @@ IsAttribute http://www.gap-system.org/lib?coll?RandomizerAttr
 implies http://www.gap-system.org/lib?coll?RandomizerAttr http://www.gap-system.org/lib?coll?IsCollection
 IsAttribute http://www.gap-system.org/lib?coll?UseSubsetRelation
 implies http://www.gap-system.org/lib?coll?UseSubsetRelation http://www.gap-system.org/lib?coll?IsCollection
+dataconstructor http://www.gap-system.org/lib?coll?IsListOrCollection
+dataconstructor http://www.gap-system.org/lib?coll?IsCollection
+dataconstructor http://www.gap-system.org/lib?coll?IsCollection_st0
+dataconstructor http://www.gap-system.org/lib?coll?IsFinite
+dataconstructor http://www.gap-system.org/lib?coll?IsNonTrivial
+dataconstructor http://www.gap-system.org/lib?coll?IsIterator
+dataconstructor http://www.gap-system.org/lib?coll?IsDoneIterator
+dataconstructor http://www.gap-system.org/lib?coll?IsWholeFamily
+dataconstructor http://www.gap-system.org/lib?coll?Randomizer
+dataconstructor http://www.gap-system.org/lib?coll?CollectionsFamily
+dataconstructor http://www.gap-system.org/lib?coll?IsTrivial
+dataconstructor http://www.gap-system.org/lib?coll?Difference
+dataconstructor http://www.gap-system.org/lib?coll?CanComputeSize
+dataconstructor http://www.gap-system.org/lib?coll?ElementsFamily
+dataconstructor http://www.gap-system.org/lib?coll?IsSubset
+dataconstructor http://www.gap-system.org/lib?coll?CanEasilySortElements
+dataconstructor http://www.gap-system.org/lib?coll?UseFactorRelation
+dataconstructor http://www.gap-system.org/lib?coll?NextIterator
+dataconstructor http://www.gap-system.org/lib?coll?Union2
+dataconstructor http://www.gap-system.org/lib?coll?RepresentativeSmallest
+dataconstructor http://www.gap-system.org/lib?coll?PseudoRandomSeed
+dataconstructor http://www.gap-system.org/lib?coll?IsEmpty
+dataconstructor http://www.gap-system.org/lib?coll?IsIteratorByFunctionsRep
+dataconstructor http://www.gap-system.org/lib?coll?IsIteratorByFunctionsRep_st0
+dataconstructor http://www.gap-system.org/lib?coll?SSortedList
+dataconstructor http://www.gap-system.org/lib?coll?AsSSortedList
+dataconstructor http://www.gap-system.org/lib?coll?IteratorSorted
+dataconstructor http://www.gap-system.org/lib?coll?SumOp
+dataconstructor http://www.gap-system.org/lib?coll?CheapRandomizer
+dataconstructor http://www.gap-system.org/lib?coll?CanEasilyCompareElements
+dataconstructor http://www.gap-system.org/lib?coll?PseudoRandom
+dataconstructor http://www.gap-system.org/lib?coll?ProductOp
+dataconstructor http://www.gap-system.org/lib?coll?UseIsomorphismRelation
+dataconstructor http://www.gap-system.org/lib?coll?AsList
+dataconstructor http://www.gap-system.org/lib?coll?AsSSortedListNonstored
+dataconstructor http://www.gap-system.org/lib?coll?IsEnumeratorByFunctionsRep
+dataconstructor http://www.gap-system.org/lib?coll?IsEnumeratorByFunctionsRep_st0
+dataconstructor http://www.gap-system.org/lib?coll?ForAllOp
+dataconstructor http://www.gap-system.org/lib?coll?Enumerator
+dataconstructor http://www.gap-system.org/lib?coll?SortedList
+dataconstructor http://www.gap-system.org/lib?coll?Iterator
+dataconstructor http://www.gap-system.org/lib?coll?FilteredOp
+dataconstructor http://www.gap-system.org/lib?coll?IsIteratorByFunctions
+dataconstructor http://www.gap-system.org/lib?coll?NumberOp
+dataconstructor http://www.gap-system.org/lib?coll?EnumeratorSorted
+dataconstructor http://www.gap-system.org/lib?coll?UnderlyingCollection
+dataconstructor http://www.gap-system.org/lib?coll?CanComputeIsSubset
+dataconstructor http://www.gap-system.org/lib?coll?ListOp
+dataconstructor http://www.gap-system.org/lib?coll?Size
+dataconstructor http://www.gap-system.org/lib?coll?CheapRandomizerAttr
+dataconstructor http://www.gap-system.org/lib?coll?ForAnyOp
+dataconstructor http://www.gap-system.org/lib?coll?Intersection2
+dataconstructor http://www.gap-system.org/lib?coll?IsEnumeratorByFunctions
+dataconstructor http://www.gap-system.org/lib?coll?AsSortedList
+dataconstructor http://www.gap-system.org/lib?coll?IsStandardIterator
+dataconstructor http://www.gap-system.org/lib?coll?Random
+dataconstructor http://www.gap-system.org/lib?coll?Representative
+dataconstructor http://www.gap-system.org/lib?coll?RandomizerAttr
+dataconstructor http://www.gap-system.org/lib?coll?UseSubsetRelation
 theory http://www.gap-system.org/lib?coll
 HasMeta http://www.gap-system.org/lib?coll http://www.gap-system.org/?Types
 Declares http://www.gap-system.org/lib?coll http://www.gap-system.org/lib?coll?IsListOrCollection
 constant http://www.gap-system.org/lib?coll?IsListOrCollection
-Includes http://www.gap-system.org/lib?coll http://www.gap-system.org/lib?coll
 Declares http://www.gap-system.org/lib?coll http://www.gap-system.org/lib?coll?IsCollection
 constant http://www.gap-system.org/lib?coll?IsCollection
 Declares http://www.gap-system.org/lib?coll http://www.gap-system.org/lib?coll?IsCollection_st0
diff --git a/relational/http..www.gap-system.org/lib/combinat.rel b/relational/http..www.gap-system.org/lib/combinat.rel
index a0a26a67b14878069de139d9cfdb1c820e54fcc5..ebd634617ddc6f09a58a39e8f7448f55285ff06e 100644
--- a/relational/http..www.gap-system.org/lib/combinat.rel
+++ b/relational/http..www.gap-system.org/lib/combinat.rel
@@ -5,6 +5,8 @@ implies http://www.gap-system.org/lib?combinat?Permanent http://www.gap-system.o
 implies http://www.gap-system.org/lib?combinat?Permanent http://www.gap-system.org/lib?arith?IsMultiplicativeElement
 IsAttribute http://www.gap-system.org/lib?combinat?LucasMod
 implies http://www.gap-system.org/lib?combinat?LucasMod http://www.gap-system.org/lib?cyclotom?IsInt
+dataconstructor http://www.gap-system.org/lib?combinat?Permanent
+dataconstructor http://www.gap-system.org/lib?combinat?LucasMod
 theory http://www.gap-system.org/lib?combinat
 HasMeta http://www.gap-system.org/lib?combinat http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?combinat http://www.gap-system.org/lib?list
diff --git a/relational/http..www.gap-system.org/lib/csetgrp.rel b/relational/http..www.gap-system.org/lib/csetgrp.rel
index 586777aca19c2fdf2a7bb7602a25a8c1588dd16d..4b5eaac2aca5432c28e51f7347931246c86f0a29 100644
--- a/relational/http..www.gap-system.org/lib/csetgrp.rel
+++ b/relational/http..www.gap-system.org/lib/csetgrp.rel
@@ -90,6 +90,83 @@ implies http://www.gap-system.org/lib?csetgrp?IsFactoredTransversalRep_st5 http:
 implies http://www.gap-system.org/lib?csetgrp?IsFactoredTransversalRep_st5 http://www.gap-system.org/lib?grp?IsRightTransversalRep
 IsAttribute http://www.gap-system.org/lib?csetgrp?RepresentativesContainedRightCosets
 implies http://www.gap-system.org/lib?csetgrp?RepresentativesContainedRightCosets http://www.gap-system.org/lib?csetgrp?IsDoubleCoset
+dataconstructor http://www.gap-system.org/lib?csetgrp?ComputedAscendingChains
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsRightTransversalViaCosetsRep
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsRightTransversalViaCosetsRep_st0
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsRightTransversalViaCosetsRep_st1
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsRightTransversalViaCosetsRep_st2
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsRightTransversalViaCosetsRep_st3
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsRightTransversalViaCosetsRep_st4
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsRightTransversalViaCosetsRep_st5
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsDoubleCoset
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsDoubleCoset_st0
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsDoubleCoset_st1
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsDoubleCoset_st2
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsDoubleCoset_st3
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsDoubleCoset_st4
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsDoubleCoset_st5
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsDoubleCoset_st6
+dataconstructor http://www.gap-system.org/lib?csetgrp?LeftActingGroup
+dataconstructor http://www.gap-system.org/lib?csetgrp?RightCosetsNC
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsRightCoset
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsRightCoset_st0
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsRightCoset_st1
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsRightCoset_st2
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsRightCoset_st3
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsRightCoset_st4
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsRightCoset_st5
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsRightCoset_st6
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsRightCoset_st7
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsRightCoset_st8
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsRightCoset_st9
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsRightCoset_st10
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsRightCoset_st11
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsRightCoset_st12
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsRightCoset_st13
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsRightCoset_st14
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsRightCosetDefaultRep
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsRightCosetDefaultRep_st0
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsRightCosetDefaultRep_st1
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsRightCosetDefaultRep_st2
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsRightCosetDefaultRep_st3
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsRightCosetDefaultRep_st4
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsRightCosetDefaultRep_st5
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsRightCosetDefaultRep_st6
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsRightCosetDefaultRep_st7
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsRightCosetDefaultRep_st8
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsRightCosetDefaultRep_st9
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsRightCosetDefaultRep_st10
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsRightCosetDefaultRep_st11
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsRightCosetDefaultRep_st12
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsRightCosetDefaultRep_st13
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsRightCosetDefaultRep_st14
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsRightCosetDefaultRep_st15
+dataconstructor http://www.gap-system.org/lib?csetgrp?DoubleCoset
+dataconstructor http://www.gap-system.org/lib?csetgrp?RightCoset
+dataconstructor http://www.gap-system.org/lib?csetgrp?DoubleCosetRepsAndSizes
+dataconstructor http://www.gap-system.org/lib?csetgrp?CanonicalRightCosetElement
+dataconstructor http://www.gap-system.org/lib?csetgrp?AscendingChainOp
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsDoubleCosetDefaultRep
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsDoubleCosetDefaultRep_st0
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsDoubleCosetDefaultRep_st1
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsDoubleCosetDefaultRep_st2
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsDoubleCosetDefaultRep_st3
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsDoubleCosetDefaultRep_st4
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsDoubleCosetDefaultRep_st5
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsDoubleCosetDefaultRep_st6
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsDoubleCosetDefaultRep_st7
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsDoubleCosetDefaultRep_st8
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsDoubleCosetDefaultRep_st9
+dataconstructor http://www.gap-system.org/lib?csetgrp?RightActingGroup
+dataconstructor http://www.gap-system.org/lib?csetgrp?DoubleCosetsNC
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsFactoredTransversalRep
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsFactoredTransversalRep_st0
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsFactoredTransversalRep_st1
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsFactoredTransversalRep_st2
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsFactoredTransversalRep_st3
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsFactoredTransversalRep_st4
+dataconstructor http://www.gap-system.org/lib?csetgrp?IsFactoredTransversalRep_st5
+dataconstructor http://www.gap-system.org/lib?csetgrp?RepresentativesContainedRightCosets
 theory http://www.gap-system.org/lib?csetgrp
 HasMeta http://www.gap-system.org/lib?csetgrp http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?csetgrp http://www.gap-system.org/lib?magma
@@ -132,7 +209,6 @@ Declares http://www.gap-system.org/lib?csetgrp http://www.gap-system.org/lib?cse
 constant http://www.gap-system.org/lib?csetgrp?IsDoubleCoset_st5
 Declares http://www.gap-system.org/lib?csetgrp http://www.gap-system.org/lib?csetgrp?IsDoubleCoset_st6
 constant http://www.gap-system.org/lib?csetgrp?IsDoubleCoset_st6
-Includes http://www.gap-system.org/lib?csetgrp http://www.gap-system.org/lib?csetgrp
 Declares http://www.gap-system.org/lib?csetgrp http://www.gap-system.org/lib?csetgrp?LeftActingGroup
 constant http://www.gap-system.org/lib?csetgrp?LeftActingGroup
 Declares http://www.gap-system.org/lib?csetgrp http://www.gap-system.org/lib?csetgrp?RightCosetsNC
diff --git a/relational/http..www.gap-system.org/lib/csetpc.rel b/relational/http..www.gap-system.org/lib/csetpc.rel
index 5d4ad403fd3ed8db2399c84e14ec43186e66ec00..55837dc2fc10505c46367bd5fdb7bef4b78bb1c1 100644
--- a/relational/http..www.gap-system.org/lib/csetpc.rel
+++ b/relational/http..www.gap-system.org/lib/csetpc.rel
@@ -5,6 +5,13 @@ implies http://www.gap-system.org/lib?csetpc?IsRightTransversalPcGroupRep_st5 ht
 implies http://www.gap-system.org/lib?csetpc?IsRightTransversalPcGroupRep_st5 http://www.gap-system.org/lib?coll?IsCollection
 implies http://www.gap-system.org/lib?csetpc?IsRightTransversalPcGroupRep_st5 http://www.gap-system.org/lib?grp?IsRightTransversal
 implies http://www.gap-system.org/lib?csetpc?IsRightTransversalPcGroupRep_st5 http://www.gap-system.org/lib?grp?IsRightTransversalRep
+dataconstructor http://www.gap-system.org/lib?csetpc?IsRightTransversalPcGroupRep
+dataconstructor http://www.gap-system.org/lib?csetpc?IsRightTransversalPcGroupRep_st0
+dataconstructor http://www.gap-system.org/lib?csetpc?IsRightTransversalPcGroupRep_st1
+dataconstructor http://www.gap-system.org/lib?csetpc?IsRightTransversalPcGroupRep_st2
+dataconstructor http://www.gap-system.org/lib?csetpc?IsRightTransversalPcGroupRep_st3
+dataconstructor http://www.gap-system.org/lib?csetpc?IsRightTransversalPcGroupRep_st4
+dataconstructor http://www.gap-system.org/lib?csetpc?IsRightTransversalPcGroupRep_st5
 theory http://www.gap-system.org/lib?csetpc
 HasMeta http://www.gap-system.org/lib?csetpc http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?csetpc http://www.gap-system.org/lib?type
diff --git a/relational/http..www.gap-system.org/lib/csetperm.rel b/relational/http..www.gap-system.org/lib/csetperm.rel
index 4206d517539758e0c4d030ce1ef50e9530fd12bd..006d5b060985830866f9dbfc21a89663a1b163f4 100644
--- a/relational/http..www.gap-system.org/lib/csetperm.rel
+++ b/relational/http..www.gap-system.org/lib/csetperm.rel
@@ -5,6 +5,13 @@ implies http://www.gap-system.org/lib?csetperm?IsRightTransversalPermGroupRep_st
 implies http://www.gap-system.org/lib?csetperm?IsRightTransversalPermGroupRep_st5 http://www.gap-system.org/lib?coll?IsCollection
 implies http://www.gap-system.org/lib?csetperm?IsRightTransversalPermGroupRep_st5 http://www.gap-system.org/lib?grp?IsRightTransversal
 implies http://www.gap-system.org/lib?csetperm?IsRightTransversalPermGroupRep_st5 http://www.gap-system.org/lib?grp?IsRightTransversalRep
+dataconstructor http://www.gap-system.org/lib?csetperm?IsRightTransversalPermGroupRep
+dataconstructor http://www.gap-system.org/lib?csetperm?IsRightTransversalPermGroupRep_st0
+dataconstructor http://www.gap-system.org/lib?csetperm?IsRightTransversalPermGroupRep_st1
+dataconstructor http://www.gap-system.org/lib?csetperm?IsRightTransversalPermGroupRep_st2
+dataconstructor http://www.gap-system.org/lib?csetperm?IsRightTransversalPermGroupRep_st3
+dataconstructor http://www.gap-system.org/lib?csetperm?IsRightTransversalPermGroupRep_st4
+dataconstructor http://www.gap-system.org/lib?csetperm?IsRightTransversalPermGroupRep_st5
 theory http://www.gap-system.org/lib?csetperm
 HasMeta http://www.gap-system.org/lib?csetperm http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?csetperm http://www.gap-system.org/lib?type
diff --git a/relational/http..www.gap-system.org/lib/ctbl.rel b/relational/http..www.gap-system.org/lib/ctbl.rel
index cf2bf9c94d4abbae648f960b8d214e1d3769d524..48804166af184534de323070a4bf45025dc9507b 100644
--- a/relational/http..www.gap-system.org/lib/ctbl.rel
+++ b/relational/http..www.gap-system.org/lib/ctbl.rel
@@ -223,11 +223,98 @@ implies http://www.gap-system.org/lib?ctbl?CompatibleConjugacyClasses http://www
 implies http://www.gap-system.org/lib?ctbl?CompatibleConjugacyClasses http://www.gap-system.org/lib?record?IsRecord
 IsAttribute http://www.gap-system.org/lib?ctbl?IsAlmostSimpleCharacterTable
 implies http://www.gap-system.org/lib?ctbl?IsAlmostSimpleCharacterTable http://www.gap-system.org/lib?ctbl?IsNearlyCharacterTable
+dataconstructor http://www.gap-system.org/lib?ctbl?IsNearlyCharacterTable
+dataconstructor http://www.gap-system.org/lib?ctbl?IsCharacterTable
+dataconstructor http://www.gap-system.org/lib?ctbl?IsCharacterTable_st0
+dataconstructor http://www.gap-system.org/lib?ctbl?IsOrdinaryTable
+dataconstructor http://www.gap-system.org/lib?ctbl?IsOrdinaryTable_st0
+dataconstructor http://www.gap-system.org/lib?ctbl?IsOrdinaryTable_st1
+dataconstructor http://www.gap-system.org/lib?ctbl?ClassPositionsOfSolvableResiduum
+dataconstructor http://www.gap-system.org/lib?ctbl?FactorsOfDirectProduct
+dataconstructor http://www.gap-system.org/lib?ctbl?ClassPositionsOfUpperCentralSeries
+dataconstructor http://www.gap-system.org/lib?ctbl?IsCharacterTableInProgress
+dataconstructor http://www.gap-system.org/lib?ctbl?IsCharacterTableInProgress_st0
+dataconstructor http://www.gap-system.org/lib?ctbl?ClassPositionsOfSupersolvableResiduum
+dataconstructor http://www.gap-system.org/lib?ctbl?CharacterTableWithSortedClasses
+dataconstructor http://www.gap-system.org/lib?ctbl?IsPSolvableCharacterTable
+dataconstructor http://www.gap-system.org/lib?ctbl?LinearCharacters
+dataconstructor http://www.gap-system.org/lib?ctbl?RealClasses
+dataconstructor http://www.gap-system.org/lib?ctbl?ClassPositionsOfSolvableRadical
+dataconstructor http://www.gap-system.org/lib?ctbl?IsGenericCharacterTableRep
+dataconstructor http://www.gap-system.org/lib?ctbl?IsGenericCharacterTableRep_st0
+dataconstructor http://www.gap-system.org/lib?ctbl?ClassPositionsOfElementaryAbelianSeries
+dataconstructor http://www.gap-system.org/lib?ctbl?OrdinaryCharacterTable
+dataconstructor http://www.gap-system.org/lib?ctbl?Identifier
+dataconstructor http://www.gap-system.org/lib?ctbl?CharacterTableIsoclinic
+dataconstructor http://www.gap-system.org/lib?ctbl?UnderlyingCharacteristic
+dataconstructor http://www.gap-system.org/lib?ctbl?CharacterTableFactorGroup
+dataconstructor http://www.gap-system.org/lib?ctbl?Indicator
+dataconstructor http://www.gap-system.org/lib?ctbl?ClassPositionsOfMaximalNormalSubgroups
+dataconstructor http://www.gap-system.org/lib?ctbl?Irr
+dataconstructor http://www.gap-system.org/lib?ctbl?CharacterTableWithSortedCharacters
+dataconstructor http://www.gap-system.org/lib?ctbl?ClassPositionsOfAgemo
+dataconstructor http://www.gap-system.org/lib?ctbl?PrimeBlocksOp
+dataconstructor http://www.gap-system.org/lib?ctbl?ClassOrbit
+dataconstructor http://www.gap-system.org/lib?ctbl?SizesCentralizers
+dataconstructor http://www.gap-system.org/lib?ctbl?ComputedPrimeBlockss
+dataconstructor http://www.gap-system.org/lib?ctbl?IsMonomialCharacterTable
+dataconstructor http://www.gap-system.org/lib?ctbl?SizesConjugacyClasses
+dataconstructor http://www.gap-system.org/lib?ctbl?ClassParameters
+dataconstructor http://www.gap-system.org/lib?ctbl?CharacterParameters
+dataconstructor http://www.gap-system.org/lib?ctbl?UnderlyingGroup
+dataconstructor http://www.gap-system.org/lib?ctbl?IsSupersolvableCharacterTable
+dataconstructor http://www.gap-system.org/lib?ctbl?ComputedIndicators
+dataconstructor http://www.gap-system.org/lib?ctbl?IsPerfectCharacterTable
+dataconstructor http://www.gap-system.org/lib?ctbl?ClassPositionsOfPCore
+dataconstructor http://www.gap-system.org/lib?ctbl?DisplayOptions
+dataconstructor http://www.gap-system.org/lib?ctbl?ClassPermutation
+dataconstructor http://www.gap-system.org/lib?ctbl?IndicatorOp
+dataconstructor http://www.gap-system.org/lib?ctbl?SortedCharacters
+dataconstructor http://www.gap-system.org/lib?ctbl?ComputedIsPSolvableCharacterTables
+dataconstructor http://www.gap-system.org/lib?ctbl?BrauerTable
+dataconstructor http://www.gap-system.org/lib?ctbl?ClassPositionsOfNormalClosure
+dataconstructor http://www.gap-system.org/lib?ctbl?IsBrauerTable
+dataconstructor http://www.gap-system.org/lib?ctbl?IsBrauerTable_st0
+dataconstructor http://www.gap-system.org/lib?ctbl?IsBrauerTable_st1
+dataconstructor http://www.gap-system.org/lib?ctbl?DecompositionMatrix
+dataconstructor http://www.gap-system.org/lib?ctbl?BrauerTableOp
+dataconstructor http://www.gap-system.org/lib?ctbl?CharacterNames
+dataconstructor http://www.gap-system.org/lib?ctbl?ClassPositionsOfLowerCentralSeries
+dataconstructor http://www.gap-system.org/lib?ctbl?AutomorphismsOfTable
+dataconstructor http://www.gap-system.org/lib?ctbl?OrdersClassRepresentatives
+dataconstructor http://www.gap-system.org/lib?ctbl?CharacterTableDirectProduct
+dataconstructor http://www.gap-system.org/lib?ctbl?ClassPositionsOfCentre
+dataconstructor http://www.gap-system.org/lib?ctbl?ClassPositionsOfDerivedSubgroup
+dataconstructor http://www.gap-system.org/lib?ctbl?IBr
+dataconstructor http://www.gap-system.org/lib?ctbl?IsSporadicSimpleCharacterTable
+dataconstructor http://www.gap-system.org/lib?ctbl?CharacterTable
+dataconstructor http://www.gap-system.org/lib?ctbl?ClassPositionsOfDirectProductDecompositions
+dataconstructor http://www.gap-system.org/lib?ctbl?IsSolvableCharacterTable
+dataconstructor http://www.gap-system.org/lib?ctbl?InverseClasses
+dataconstructor http://www.gap-system.org/lib?ctbl?PrimeBlocks
+dataconstructor http://www.gap-system.org/lib?ctbl?ClassPositionsOfFittingSubgroup
+dataconstructor http://www.gap-system.org/lib?ctbl?ClassPositionsOfMinimalNormalSubgroups
+dataconstructor http://www.gap-system.org/lib?ctbl?IdentificationOfConjugacyClasses
+dataconstructor http://www.gap-system.org/lib?ctbl?CharacterDegrees
+dataconstructor http://www.gap-system.org/lib?ctbl?ComputedBrauerTables
+dataconstructor http://www.gap-system.org/lib?ctbl?IsLibraryCharacterTableRep
+dataconstructor http://www.gap-system.org/lib?ctbl?IsLibraryCharacterTableRep_st0
+dataconstructor http://www.gap-system.org/lib?ctbl?IsLibraryCharacterTableRep_st1
+dataconstructor http://www.gap-system.org/lib?ctbl?IsPSolvableCharacterTableOp
+dataconstructor http://www.gap-system.org/lib?ctbl?ClassPositionsOfNormalSubgroups
+dataconstructor http://www.gap-system.org/lib?ctbl?NormalSubgroupClassesInfo
+dataconstructor http://www.gap-system.org/lib?ctbl?ClassRoots
+dataconstructor http://www.gap-system.org/lib?ctbl?SourceOfIsoclinicTable
+dataconstructor http://www.gap-system.org/lib?ctbl?IsSimpleCharacterTable
+dataconstructor http://www.gap-system.org/lib?ctbl?ClassNames
+dataconstructor http://www.gap-system.org/lib?ctbl?BlocksInfo
+dataconstructor http://www.gap-system.org/lib?ctbl?IsNilpotentCharacterTable
+dataconstructor http://www.gap-system.org/lib?ctbl?CompatibleConjugacyClasses
+dataconstructor http://www.gap-system.org/lib?ctbl?IsAlmostSimpleCharacterTable
 theory http://www.gap-system.org/lib?ctbl
 HasMeta http://www.gap-system.org/lib?ctbl http://www.gap-system.org/?Types
 Declares http://www.gap-system.org/lib?ctbl http://www.gap-system.org/lib?ctbl?IsNearlyCharacterTable
 constant http://www.gap-system.org/lib?ctbl?IsNearlyCharacterTable
-Includes http://www.gap-system.org/lib?ctbl http://www.gap-system.org/lib?ctbl
 Declares http://www.gap-system.org/lib?ctbl http://www.gap-system.org/lib?ctbl?IsCharacterTable
 constant http://www.gap-system.org/lib?ctbl?IsCharacterTable
 Declares http://www.gap-system.org/lib?ctbl http://www.gap-system.org/lib?ctbl?IsCharacterTable_st0
diff --git a/relational/http..www.gap-system.org/lib/ctblauto.rel b/relational/http..www.gap-system.org/lib/ctblauto.rel
index 27958da4d7b946f58bbcf67f8c19809ff2d9dbc5..c1774df0bc5e906a6a77adef746028d00102ae0c 100644
--- a/relational/http..www.gap-system.org/lib/ctblauto.rel
+++ b/relational/http..www.gap-system.org/lib/ctblauto.rel
@@ -21,6 +21,10 @@ implies http://www.gap-system.org/lib?ctblauto?TableAutomorphisms http://www.gap
 implies http://www.gap-system.org/lib?ctblauto?TableAutomorphisms http://www.gap-system.org/lib?permutat?IsPerm
 implies http://www.gap-system.org/lib?ctblauto?TableAutomorphisms http://www.gap-system.org/lib?magma?IsMagmaWithInverses
 implies http://www.gap-system.org/lib?ctblauto?TableAutomorphisms http://www.gap-system.org/lib?magma?IsAssociative
+dataconstructor http://www.gap-system.org/lib?ctblauto?TransformingPermutations
+dataconstructor http://www.gap-system.org/lib?ctblauto?MatrixAutomorphisms
+dataconstructor http://www.gap-system.org/lib?ctblauto?TransformingPermutationsCharacterTables
+dataconstructor http://www.gap-system.org/lib?ctblauto?TableAutomorphisms
 theory http://www.gap-system.org/lib?ctblauto
 HasMeta http://www.gap-system.org/lib?ctblauto http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?ctblauto http://www.gap-system.org/lib?list
diff --git a/relational/http..www.gap-system.org/lib/ctblfuns.rel b/relational/http..www.gap-system.org/lib/ctblfuns.rel
index d20e15e9110889799f9e316384e1285a1c5ea0a8..528d34177f912a9c1d0461ffeb4298c8aa98e08a 100644
--- a/relational/http..www.gap-system.org/lib/ctblfuns.rel
+++ b/relational/http..www.gap-system.org/lib/ctblfuns.rel
@@ -187,6 +187,100 @@ implies http://www.gap-system.org/lib?ctblfuns?RestrictedClassFunctions http://w
 implies http://www.gap-system.org/lib?ctblfuns?RestrictedClassFunctions http://www.gap-system.org/lib?magma?IsAssociative
 implies http://www.gap-system.org/lib?ctblfuns?RestrictedClassFunctions http://www.gap-system.org/lib?ctbl?IsNearlyCharacterTable
 implies http://www.gap-system.org/lib?ctblfuns?RestrictedClassFunctions http://www.gap-system.org/lib?mapping?IsGeneralMapping
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunction
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunction_st0
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunction_st1
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunction_st2
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunction_st3
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunction_st4
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunction_st5
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunction_st6
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunction_st7
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunction_st8
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunction_st9
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunction_st10
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunction_st11
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunction_st12
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunction_st13
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunction_st14
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunction_st15
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunction_st16
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunction_st17
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunction_st18
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunction_st19
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunction_st20
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunction_st21
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunction_st22
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunction_st23
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunction_st24
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunction_st25
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunction_st26
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunction_st27
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunction_st28
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunction_st29
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsCharacter
+dataconstructor http://www.gap-system.org/lib?ctblfuns?CycleStructureClass
+dataconstructor http://www.gap-system.org/lib?ctblfuns?Symmetrizations
+dataconstructor http://www.gap-system.org/lib?ctblfuns?ReducedCharacters
+dataconstructor http://www.gap-system.org/lib?ctblfuns?ClassFunction
+dataconstructor http://www.gap-system.org/lib?ctblfuns?CorrespondingPermutations
+dataconstructor http://www.gap-system.org/lib?ctblfuns?Character
+dataconstructor http://www.gap-system.org/lib?ctblfuns?BrauerCharacterValue
+dataconstructor http://www.gap-system.org/lib?ctblfuns?CentreOfCharacter
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunctionsSpace
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunctionsSpace_st0
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunctionsSpace_st1
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunctionsSpace_st2
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunctionsSpace_st3
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunctionsSpace_st4
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunctionsSpace_st5
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunctionsSpace_st6
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunctionsSpace_st7
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunctionsSpace_st8
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunctionsSpace_st9
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunctionsSpace_st10
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunctionsSpace_st11
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunctionsSpace_st12
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunctionsSpace_st13
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunctionsSpace_st14
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunctionsSpace_st15
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunctionsSpace_st16
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunctionsSpace_st17
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunctionsSpace_st18
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunctionsSpace_st19
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunctionsSpace_st20
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunctionsSpace_st21
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunctionsSpace_st22
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunctionsSpace_st23
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunctionsSpace_st24
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsClassFunctionsSpace_st25
+dataconstructor http://www.gap-system.org/lib?ctblfuns?Tensored
+dataconstructor http://www.gap-system.org/lib?ctblfuns?Restricted
+dataconstructor http://www.gap-system.org/lib?ctblfuns?ConstituentsOfCharacter
+dataconstructor http://www.gap-system.org/lib?ctblfuns?VirtualCharacter
+dataconstructor http://www.gap-system.org/lib?ctblfuns?ReducedClassFunctions
+dataconstructor http://www.gap-system.org/lib?ctblfuns?MatScalarProducts
+dataconstructor http://www.gap-system.org/lib?ctblfuns?InducedClassFunctions
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsIrreducibleCharacter
+dataconstructor http://www.gap-system.org/lib?ctblfuns?InducedClassFunction
+dataconstructor http://www.gap-system.org/lib?ctblfuns?InertiaSubgroup
+dataconstructor http://www.gap-system.org/lib?ctblfuns?EigenvaluesChar
+dataconstructor http://www.gap-system.org/lib?ctblfuns?ValuesOfClassFunction
+dataconstructor http://www.gap-system.org/lib?ctblfuns?GlobalPartitionOfClasses
+dataconstructor http://www.gap-system.org/lib?ctblfuns?PermutationCharacter
+dataconstructor http://www.gap-system.org/lib?ctblfuns?DeterminantOfCharacter
+dataconstructor http://www.gap-system.org/lib?ctblfuns?CentralCharacter
+dataconstructor http://www.gap-system.org/lib?ctblfuns?ClassPositionsOfKernel
+dataconstructor http://www.gap-system.org/lib?ctblfuns?KernelOfCharacter
+dataconstructor http://www.gap-system.org/lib?ctblfuns?UnderlyingCharacterTable
+dataconstructor http://www.gap-system.org/lib?ctblfuns?TrivialCharacter
+dataconstructor http://www.gap-system.org/lib?ctblfuns?RestrictedClassFunction
+dataconstructor http://www.gap-system.org/lib?ctblfuns?InducedCyclic
+dataconstructor http://www.gap-system.org/lib?ctblfuns?DegreeOfCharacter
+dataconstructor http://www.gap-system.org/lib?ctblfuns?IsVirtualCharacter
+dataconstructor http://www.gap-system.org/lib?ctblfuns?Induced
+dataconstructor http://www.gap-system.org/lib?ctblfuns?NaturalCharacter
+dataconstructor http://www.gap-system.org/lib?ctblfuns?RestrictedClassFunctions
 theory http://www.gap-system.org/lib?ctblfuns
 HasMeta http://www.gap-system.org/lib?ctblfuns http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?ctblfuns http://www.gap-system.org/lib?list
@@ -254,7 +348,6 @@ Declares http://www.gap-system.org/lib?ctblfuns http://www.gap-system.org/lib?ct
 constant http://www.gap-system.org/lib?ctblfuns?IsClassFunction_st28
 Declares http://www.gap-system.org/lib?ctblfuns http://www.gap-system.org/lib?ctblfuns?IsClassFunction_st29
 constant http://www.gap-system.org/lib?ctblfuns?IsClassFunction_st29
-Includes http://www.gap-system.org/lib?ctblfuns http://www.gap-system.org/lib?ctblfuns
 Includes http://www.gap-system.org/lib?ctblfuns http://www.gap-system.org/lib?ctbl
 Declares http://www.gap-system.org/lib?ctblfuns http://www.gap-system.org/lib?ctblfuns?IsCharacter
 constant http://www.gap-system.org/lib?ctblfuns?IsCharacter
diff --git a/relational/http..www.gap-system.org/lib/ctblgrp.rel b/relational/http..www.gap-system.org/lib/ctblgrp.rel
index b3c1bf31e4b80869fcbda9bffa66c7c8c5fdef93..dc32d6f21bb4eaa6101244acab17e85386813009 100644
--- a/relational/http..www.gap-system.org/lib/ctblgrp.rel
+++ b/relational/http..www.gap-system.org/lib/ctblgrp.rel
@@ -9,6 +9,9 @@ implies http://www.gap-system.org/lib?ctblgrp?DxPreparation http://www.gap-syste
 IsAttribute http://www.gap-system.org/lib?ctblgrp?DixonRecord
 implies http://www.gap-system.org/lib?ctblgrp?DixonRecord http://www.gap-system.org/lib?magma?IsMagmaWithInverses
 implies http://www.gap-system.org/lib?ctblgrp?DixonRecord http://www.gap-system.org/lib?magma?IsAssociative
+dataconstructor http://www.gap-system.org/lib?ctblgrp?IrrDixonSchneider
+dataconstructor http://www.gap-system.org/lib?ctblgrp?DxPreparation
+dataconstructor http://www.gap-system.org/lib?ctblgrp?DixonRecord
 theory http://www.gap-system.org/lib?ctblgrp
 HasMeta http://www.gap-system.org/lib?ctblgrp http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?ctblgrp http://www.gap-system.org/lib?magma
diff --git a/relational/http..www.gap-system.org/lib/ctblmaps.rel b/relational/http..www.gap-system.org/lib/ctblmaps.rel
index cf4e4bb8dc93740e190adfd5c5839b9f92d65796..d8d3baca25ca428d3ca984489b213201b2773647 100644
--- a/relational/http..www.gap-system.org/lib/ctblmaps.rel
+++ b/relational/http..www.gap-system.org/lib/ctblmaps.rel
@@ -25,6 +25,15 @@ implies http://www.gap-system.org/lib?ctblmaps?PowerMap http://www.gap-system.or
 IsAttribute http://www.gap-system.org/lib?ctblmaps?PossibleClassFusions
 implies http://www.gap-system.org/lib?ctblmaps?PossibleClassFusions http://www.gap-system.org/lib?ctbl?IsNearlyCharacterTable
 implies http://www.gap-system.org/lib?ctblmaps?PossibleClassFusions http://www.gap-system.org/lib?record?IsRecord
+dataconstructor http://www.gap-system.org/lib?ctblmaps?ComputedClassFusions
+dataconstructor http://www.gap-system.org/lib?ctblmaps?FusionConjugacyClasses
+dataconstructor http://www.gap-system.org/lib?ctblmaps?ComputedPowerMaps
+dataconstructor http://www.gap-system.org/lib?ctblmaps?PossiblePowerMaps
+dataconstructor http://www.gap-system.org/lib?ctblmaps?PowerMapOp
+dataconstructor http://www.gap-system.org/lib?ctblmaps?NamesOfFusionSources
+dataconstructor http://www.gap-system.org/lib?ctblmaps?FusionConjugacyClassesOp
+dataconstructor http://www.gap-system.org/lib?ctblmaps?PowerMap
+dataconstructor http://www.gap-system.org/lib?ctblmaps?PossibleClassFusions
 theory http://www.gap-system.org/lib?ctblmaps
 HasMeta http://www.gap-system.org/lib?ctblmaps http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?ctblmaps http://www.gap-system.org/lib?ctbl
diff --git a/relational/http..www.gap-system.org/lib/ctblmoli.rel b/relational/http..www.gap-system.org/lib/ctblmoli.rel
index 90838e276b3ec910ab8031605b1e96391946b453..c8133d69a13063c56ecd94819ff86d43aa814b7c 100644
--- a/relational/http..www.gap-system.org/lib/ctblmoli.rel
+++ b/relational/http..www.gap-system.org/lib/ctblmoli.rel
@@ -1,5 +1,6 @@
 IsAttribute http://www.gap-system.org/lib?ctblmoli?MolienSeriesInfo
 implies http://www.gap-system.org/lib?ctblmoli?MolienSeriesInfo http://www.gap-system.org/lib?ratfun?IsRationalFunction
+dataconstructor http://www.gap-system.org/lib?ctblmoli?MolienSeriesInfo
 theory http://www.gap-system.org/lib?ctblmoli
 HasMeta http://www.gap-system.org/lib?ctblmoli http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?ctblmoli http://www.gap-system.org/lib?ratfun
diff --git a/relational/http..www.gap-system.org/lib/ctblmono.rel b/relational/http..www.gap-system.org/lib/ctblmono.rel
index 34bf294bc34f35fb252c7eb18a9a0de98a576ea6..b97d72500b0603454485325cf09025f8c6d83366 100644
--- a/relational/http..www.gap-system.org/lib/ctblmono.rel
+++ b/relational/http..www.gap-system.org/lib/ctblmono.rel
@@ -49,6 +49,22 @@ IsAttribute http://www.gap-system.org/lib?ctblmono?IsSubnormallyMonomial
 implies http://www.gap-system.org/lib?ctblmono?IsSubnormallyMonomial http://www.gap-system.org/lib?magma?IsMagmaWithInverses
 implies http://www.gap-system.org/lib?ctblmono?IsSubnormallyMonomial http://www.gap-system.org/lib?magma?IsAssociative
 implies http://www.gap-system.org/lib?ctblmono?IsSubnormallyMonomial http://www.gap-system.org/lib?ctblfuns?IsClassFunction
+dataconstructor http://www.gap-system.org/lib?ctblmono?IsRelativelySM
+dataconstructor http://www.gap-system.org/lib?ctblmono?TestSubnormallyMonomial
+dataconstructor http://www.gap-system.org/lib?ctblmono?IsPrimitiveCharacter
+dataconstructor http://www.gap-system.org/lib?ctblmono?TestRelativelySM
+dataconstructor http://www.gap-system.org/lib?ctblmono?IsInducedFromNormalSubgroup
+dataconstructor http://www.gap-system.org/lib?ctblmono?TestMonomialQuick
+dataconstructor http://www.gap-system.org/lib?ctblmono?TestMonomial
+dataconstructor http://www.gap-system.org/lib?ctblmono?Alpha
+dataconstructor http://www.gap-system.org/lib?ctblmono?Delta
+dataconstructor http://www.gap-system.org/lib?ctblmono?TestQuasiPrimitive
+dataconstructor http://www.gap-system.org/lib?ctblmono?IsMinimalNonmonomial
+dataconstructor http://www.gap-system.org/lib?ctblmono?IsBergerCondition
+dataconstructor http://www.gap-system.org/lib?ctblmono?IsMonomialCharacter
+dataconstructor http://www.gap-system.org/lib?ctblmono?IsMonomialNumber
+dataconstructor http://www.gap-system.org/lib?ctblmono?IsQuasiPrimitive
+dataconstructor http://www.gap-system.org/lib?ctblmono?IsSubnormallyMonomial
 theory http://www.gap-system.org/lib?ctblmono
 HasMeta http://www.gap-system.org/lib?ctblmono http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?ctblmono http://www.gap-system.org/lib?ctblfuns
diff --git a/relational/http..www.gap-system.org/lib/ctblpope.rel b/relational/http..www.gap-system.org/lib/ctblpope.rel
index b6ed9e05d4f712a18fd7457273616136dfb0d612..af3b5b2e1bf052156075a9aa5293c1e470d2f51a 100644
--- a/relational/http..www.gap-system.org/lib/ctblpope.rel
+++ b/relational/http..www.gap-system.org/lib/ctblpope.rel
@@ -1,6 +1,7 @@
 IsAttribute http://www.gap-system.org/lib?ctblpope?Inequalities
 implies http://www.gap-system.org/lib?ctblpope?Inequalities http://www.gap-system.org/lib?ctbl?IsOrdinaryTable
 implies http://www.gap-system.org/lib?ctblpope?Inequalities http://www.gap-system.org/lib?list?IsList
+dataconstructor http://www.gap-system.org/lib?ctblpope?Inequalities
 theory http://www.gap-system.org/lib?ctblpope
 HasMeta http://www.gap-system.org/lib?ctblpope http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?ctblpope http://www.gap-system.org/lib?ctbl
diff --git a/relational/http..www.gap-system.org/lib/ctblsolv.rel b/relational/http..www.gap-system.org/lib/ctblsolv.rel
index 002b266b503c5b4034e5e96b905cdbbe70e814c6..66e5f54f19016985aee6fcf88b422b44f2546f95 100644
--- a/relational/http..www.gap-system.org/lib/ctblsolv.rel
+++ b/relational/http..www.gap-system.org/lib/ctblsolv.rel
@@ -30,6 +30,10 @@ implies http://www.gap-system.org/lib?ctblsolv?IrreducibleRepresentations http:/
 IsAttribute http://www.gap-system.org/lib?ctblsolv?IrrConlon
 implies http://www.gap-system.org/lib?ctblsolv?IrrConlon http://www.gap-system.org/lib?magma?IsMagmaWithInverses
 implies http://www.gap-system.org/lib?ctblsolv?IrrConlon http://www.gap-system.org/lib?magma?IsAssociative
+dataconstructor http://www.gap-system.org/lib?ctblsolv?BaumClausenInfo
+dataconstructor http://www.gap-system.org/lib?ctblsolv?IrrBaumClausen
+dataconstructor http://www.gap-system.org/lib?ctblsolv?IrreducibleRepresentations
+dataconstructor http://www.gap-system.org/lib?ctblsolv?IrrConlon
 theory http://www.gap-system.org/lib?ctblsolv
 HasMeta http://www.gap-system.org/lib?ctblsolv http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?ctblsolv http://www.gap-system.org/lib?magma
diff --git a/relational/http..www.gap-system.org/lib/cyclotom.rel b/relational/http..www.gap-system.org/lib/cyclotom.rel
index a0186e03e87edb96f75c3182e43331e269d19003..85e57b643da60391c74c2abfd92883feb5794619 100644
--- a/relational/http..www.gap-system.org/lib/cyclotom.rel
+++ b/relational/http..www.gap-system.org/lib/cyclotom.rel
@@ -182,6 +182,172 @@ implies http://www.gap-system.org/lib?cyclotom?RoundCyc http://www.gap-system.or
 IsAttribute http://www.gap-system.org/lib?cyclotom?Conductor
 implies http://www.gap-system.org/lib?cyclotom?Conductor http://www.gap-system.org/lib?cyclotom?IsCyc
 implies http://www.gap-system.org/lib?cyclotom?Conductor http://www.gap-system.org/lib?cyclotom?IsCyclotomic
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsCyclotomic
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsCyclotomic_st0
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsCyclotomic_st1
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsCyclotomic_st2
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsCyclotomic_st3
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsCyclotomic_st4
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsCyclotomic_st5
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsCyclotomic_st6
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsCyclotomic_st7
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsCyclotomic_st8
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsCyclotomic_st9
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsCyclotomic_st10
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsCyclotomic_st11
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsCyclotomic_st12
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsCyclotomic_st13
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsCyc
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsCyc_st0
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsCyc_st1
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsCyc_st2
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsCyc_st3
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsCyc_st4
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsCyc_st5
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsCyc_st6
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsCyc_st7
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsCyc_st8
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsCyc_st9
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsCyc_st10
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsCyc_st11
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsCyc_st12
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsCyc_st13
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsCyc_st14
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsRat
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsRat_st0
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsRat_st1
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsRat_st2
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsRat_st3
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsRat_st4
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsRat_st5
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsRat_st6
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsRat_st7
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsRat_st8
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsRat_st9
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsRat_st10
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsRat_st11
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsRat_st12
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsRat_st13
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsRat_st14
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsRat_st15
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsInt
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsInt_st0
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsInt_st1
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsInt_st2
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsInt_st3
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsInt_st4
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsInt_st5
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsInt_st6
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsInt_st7
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsInt_st8
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsInt_st9
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsInt_st10
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsInt_st11
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsInt_st12
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsInt_st13
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsInt_st14
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsInt_st15
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsInt_st16
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsPosRat
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsPosRat_st0
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsPosRat_st1
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsPosRat_st2
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsPosRat_st3
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsPosRat_st4
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsPosRat_st5
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsPosRat_st6
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsPosRat_st7
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsPosRat_st8
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsPosRat_st9
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsPosRat_st10
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsPosRat_st11
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsPosRat_st12
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsPosRat_st13
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsPosRat_st14
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsPosRat_st15
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsPosRat_st16
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsNegInfinity
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsNegInfinity_st0
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsNegInfinity_st1
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsNegInfinity_st2
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsNegInfinity_st3
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsNegInfinity_st4
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsNegInfinity_st5
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsNegInfinity_st6
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsNegInfinity_st7
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsNegInfinity_st8
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsNegInfinity_st9
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsNegInfinity_st10
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsNegInfinity_st11
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsNegInfinity_st12
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsNegInfinity_st13
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsNegInfinity_st14
+dataconstructor http://www.gap-system.org/lib?cyclotom?GaloisCyc
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsZeroCyc
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsZeroCyc_st0
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsZeroCyc_st1
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsZeroCyc_st2
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsZeroCyc_st3
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsZeroCyc_st4
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsZeroCyc_st5
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsZeroCyc_st6
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsZeroCyc_st7
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsZeroCyc_st8
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsZeroCyc_st9
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsZeroCyc_st10
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsZeroCyc_st11
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsZeroCyc_st12
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsZeroCyc_st13
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsZeroCyc_st14
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsZeroCyc_st15
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsZeroCyc_st16
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsZeroCyc_st17
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsZeroCyc_st18
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsZeroCyc_st19
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsPosInt
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsInfinity
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsInfinity_st0
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsInfinity_st1
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsInfinity_st2
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsInfinity_st3
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsInfinity_st4
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsInfinity_st5
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsInfinity_st6
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsInfinity_st7
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsInfinity_st8
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsInfinity_st9
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsInfinity_st10
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsInfinity_st11
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsInfinity_st12
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsInfinity_st13
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsInfinity_st14
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsNegRat
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsNegRat_st0
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsNegRat_st1
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsNegRat_st2
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsNegRat_st3
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsNegRat_st4
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsNegRat_st5
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsNegRat_st6
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsNegRat_st7
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsNegRat_st8
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsNegRat_st9
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsNegRat_st10
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsNegRat_st11
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsNegRat_st12
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsNegRat_st13
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsNegRat_st14
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsNegRat_st15
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsNegRat_st16
+dataconstructor http://www.gap-system.org/lib?cyclotom?RationalizedMat
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsNegInt
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsIntegralCyclotomic
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsSmallIntRep
+dataconstructor http://www.gap-system.org/lib?cyclotom?IsSmallIntRep_st0
+dataconstructor http://www.gap-system.org/lib?cyclotom?GaloisMat
+dataconstructor http://www.gap-system.org/lib?cyclotom?RoundCycDown
+dataconstructor http://www.gap-system.org/lib?cyclotom?RoundCyc
+dataconstructor http://www.gap-system.org/lib?cyclotom?Conductor
 theory http://www.gap-system.org/lib?cyclotom
 HasMeta http://www.gap-system.org/lib?cyclotom http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?cyclotom http://www.gap-system.org/lib?arith
@@ -215,7 +381,6 @@ Declares http://www.gap-system.org/lib?cyclotom http://www.gap-system.org/lib?cy
 constant http://www.gap-system.org/lib?cyclotom?IsCyclotomic_st12
 Declares http://www.gap-system.org/lib?cyclotom http://www.gap-system.org/lib?cyclotom?IsCyclotomic_st13
 constant http://www.gap-system.org/lib?cyclotom?IsCyclotomic_st13
-Includes http://www.gap-system.org/lib?cyclotom http://www.gap-system.org/lib?cyclotom
 Declares http://www.gap-system.org/lib?cyclotom http://www.gap-system.org/lib?cyclotom?IsCyc
 constant http://www.gap-system.org/lib?cyclotom?IsCyc
 Declares http://www.gap-system.org/lib?cyclotom http://www.gap-system.org/lib?cyclotom?IsCyc_st0
diff --git a/relational/http..www.gap-system.org/lib/dict.rel b/relational/http..www.gap-system.org/lib/dict.rel
index e25acc7f66c4c00cca2395695927c485014069fb..113dccc1a92afd8b7c9fb96e2c4eb599502db7f6 100644
--- a/relational/http..www.gap-system.org/lib/dict.rel
+++ b/relational/http..www.gap-system.org/lib/dict.rel
@@ -96,6 +96,93 @@ implies http://www.gap-system.org/lib?dict?IsSparseHashRep_st5 http://www.gap-sy
 IsFilter http://www.gap-system.org/lib?dict?TableHasIntKeyFun
 IsAttribute http://www.gap-system.org/lib?dict?LookupDictionary
 implies http://www.gap-system.org/lib?dict?LookupDictionary http://www.gap-system.org/lib?dict?IsDictionary
+dataconstructor http://www.gap-system.org/lib?dict?IsDictionary
+dataconstructor http://www.gap-system.org/lib?dict?IsDictionary_st0
+dataconstructor http://www.gap-system.org/lib?dict?IsDictionary_st1
+dataconstructor http://www.gap-system.org/lib?dict?AddDictionary
+dataconstructor http://www.gap-system.org/lib?dict?KnowsDictionary
+dataconstructor http://www.gap-system.org/lib?dict?IsLookupDictionary
+dataconstructor http://www.gap-system.org/lib?dict?IsLookupDictionary_st0
+dataconstructor http://www.gap-system.org/lib?dict?IsLookupDictionary_st1
+dataconstructor http://www.gap-system.org/lib?dict?IsLookupDictionary_st2
+dataconstructor http://www.gap-system.org/lib?dict?IsDictionaryDefaultRep
+dataconstructor http://www.gap-system.org/lib?dict?IsDictionaryDefaultRep_st0
+dataconstructor http://www.gap-system.org/lib?dict?IsDictionaryDefaultRep_st1
+dataconstructor http://www.gap-system.org/lib?dict?IsDictionaryDefaultRep_st2
+dataconstructor http://www.gap-system.org/lib?dict?IsDictionaryDefaultRep_st3
+dataconstructor http://www.gap-system.org/lib?dict?IsListDictionary
+dataconstructor http://www.gap-system.org/lib?dict?IsListDictionary_st0
+dataconstructor http://www.gap-system.org/lib?dict?IsListDictionary_st1
+dataconstructor http://www.gap-system.org/lib?dict?IsListDictionary_st2
+dataconstructor http://www.gap-system.org/lib?dict?IsListDictionary_st3
+dataconstructor http://www.gap-system.org/lib?dict?IsListDictionary_st4
+dataconstructor http://www.gap-system.org/lib?dict?IsListLookupDictionary
+dataconstructor http://www.gap-system.org/lib?dict?IsListLookupDictionary_st0
+dataconstructor http://www.gap-system.org/lib?dict?IsListLookupDictionary_st1
+dataconstructor http://www.gap-system.org/lib?dict?IsListLookupDictionary_st2
+dataconstructor http://www.gap-system.org/lib?dict?IsListLookupDictionary_st3
+dataconstructor http://www.gap-system.org/lib?dict?IsListLookupDictionary_st4
+dataconstructor http://www.gap-system.org/lib?dict?IsListLookupDictionary_st5
+dataconstructor http://www.gap-system.org/lib?dict?IsListLookupDictionary_st6
+dataconstructor http://www.gap-system.org/lib?dict?IsSortDictionary
+dataconstructor http://www.gap-system.org/lib?dict?IsSortDictionary_st0
+dataconstructor http://www.gap-system.org/lib?dict?IsSortDictionary_st1
+dataconstructor http://www.gap-system.org/lib?dict?IsSortDictionary_st2
+dataconstructor http://www.gap-system.org/lib?dict?IsSortDictionary_st3
+dataconstructor http://www.gap-system.org/lib?dict?IsSortDictionary_st4
+dataconstructor http://www.gap-system.org/lib?dict?IsSortDictionary_st5
+dataconstructor http://www.gap-system.org/lib?dict?IsSortLookupDictionary
+dataconstructor http://www.gap-system.org/lib?dict?IsSortLookupDictionary_st0
+dataconstructor http://www.gap-system.org/lib?dict?IsSortLookupDictionary_st1
+dataconstructor http://www.gap-system.org/lib?dict?IsSortLookupDictionary_st2
+dataconstructor http://www.gap-system.org/lib?dict?IsSortLookupDictionary_st3
+dataconstructor http://www.gap-system.org/lib?dict?IsSortLookupDictionary_st4
+dataconstructor http://www.gap-system.org/lib?dict?IsSortLookupDictionary_st5
+dataconstructor http://www.gap-system.org/lib?dict?IsSortLookupDictionary_st6
+dataconstructor http://www.gap-system.org/lib?dict?IsSortLookupDictionary_st7
+dataconstructor http://www.gap-system.org/lib?dict?IsSortLookupDictionary_st8
+dataconstructor http://www.gap-system.org/lib?dict?SparseIntKey
+dataconstructor http://www.gap-system.org/lib?dict?ListKeyEnumerator
+dataconstructor http://www.gap-system.org/lib?dict?IsPositionDictionary
+dataconstructor http://www.gap-system.org/lib?dict?IsPositionDictionary_st0
+dataconstructor http://www.gap-system.org/lib?dict?IsPositionDictionary_st1
+dataconstructor http://www.gap-system.org/lib?dict?IsPositionDictionary_st2
+dataconstructor http://www.gap-system.org/lib?dict?IsPositionDictionary_st3
+dataconstructor http://www.gap-system.org/lib?dict?IsPositionDictionary_st4
+dataconstructor http://www.gap-system.org/lib?dict?IsHash
+dataconstructor http://www.gap-system.org/lib?dict?IsHash_st0
+dataconstructor http://www.gap-system.org/lib?dict?IsHash_st1
+dataconstructor http://www.gap-system.org/lib?dict?IsHash_st2
+dataconstructor http://www.gap-system.org/lib?dict?IsHash_st3
+dataconstructor http://www.gap-system.org/lib?dict?PrintHashWithNames
+dataconstructor http://www.gap-system.org/lib?dict?GetHashEntryAtLastIndex
+dataconstructor http://www.gap-system.org/lib?dict?DenseIntKey
+dataconstructor http://www.gap-system.org/lib?dict?IsDenseHashRep
+dataconstructor http://www.gap-system.org/lib?dict?IsDenseHashRep_st0
+dataconstructor http://www.gap-system.org/lib?dict?IsDenseHashRep_st1
+dataconstructor http://www.gap-system.org/lib?dict?IsDenseHashRep_st2
+dataconstructor http://www.gap-system.org/lib?dict?IsDenseHashRep_st3
+dataconstructor http://www.gap-system.org/lib?dict?IsDenseHashRep_st4
+dataconstructor http://www.gap-system.org/lib?dict?IsDenseHashRep_st5
+dataconstructor http://www.gap-system.org/lib?dict?RemoveDictionary
+dataconstructor http://www.gap-system.org/lib?dict?RandomHashKey
+dataconstructor http://www.gap-system.org/lib?dict?IsPositionLookupDictionary
+dataconstructor http://www.gap-system.org/lib?dict?IsPositionLookupDictionary_st0
+dataconstructor http://www.gap-system.org/lib?dict?IsPositionLookupDictionary_st1
+dataconstructor http://www.gap-system.org/lib?dict?IsPositionLookupDictionary_st2
+dataconstructor http://www.gap-system.org/lib?dict?IsPositionLookupDictionary_st3
+dataconstructor http://www.gap-system.org/lib?dict?IsPositionLookupDictionary_st4
+dataconstructor http://www.gap-system.org/lib?dict?IsPositionLookupDictionary_st5
+dataconstructor http://www.gap-system.org/lib?dict?IsPositionLookupDictionary_st6
+dataconstructor http://www.gap-system.org/lib?dict?IsSparseHashRep
+dataconstructor http://www.gap-system.org/lib?dict?IsSparseHashRep_st0
+dataconstructor http://www.gap-system.org/lib?dict?IsSparseHashRep_st1
+dataconstructor http://www.gap-system.org/lib?dict?IsSparseHashRep_st2
+dataconstructor http://www.gap-system.org/lib?dict?IsSparseHashRep_st3
+dataconstructor http://www.gap-system.org/lib?dict?IsSparseHashRep_st4
+dataconstructor http://www.gap-system.org/lib?dict?IsSparseHashRep_st5
+dataconstructor http://www.gap-system.org/lib?dict?TableHasIntKeyFun
+dataconstructor http://www.gap-system.org/lib?dict?LookupDictionary
 theory http://www.gap-system.org/lib?dict
 HasMeta http://www.gap-system.org/lib?dict http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?dict http://www.gap-system.org/lib?coll
@@ -106,7 +193,6 @@ constant http://www.gap-system.org/lib?dict?IsDictionary_st0
 Declares http://www.gap-system.org/lib?dict http://www.gap-system.org/lib?dict?IsDictionary_st1
 constant http://www.gap-system.org/lib?dict?IsDictionary_st1
 Includes http://www.gap-system.org/lib?dict http://www.gap-system.org/lib?object
-Includes http://www.gap-system.org/lib?dict http://www.gap-system.org/lib?dict
 Declares http://www.gap-system.org/lib?dict http://www.gap-system.org/lib?dict?AddDictionary
 constant http://www.gap-system.org/lib?dict?AddDictionary
 Declares http://www.gap-system.org/lib?dict http://www.gap-system.org/lib?dict?KnowsDictionary
diff --git a/relational/http..www.gap-system.org/lib/domain.rel b/relational/http..www.gap-system.org/lib/domain.rel
index b4dec45b7d581d79537a9626383dc829b0bdbce6..8f729aa941f27330a14ada6f40b96e971432bca7 100644
--- a/relational/http..www.gap-system.org/lib/domain.rel
+++ b/relational/http..www.gap-system.org/lib/domain.rel
@@ -11,12 +11,16 @@ implies http://www.gap-system.org/lib?domain?DomainByGenerators http://www.gap-s
 IsFilter http://www.gap-system.org/lib?domain?IsDomain
 implies http://www.gap-system.org/lib?domain?IsDomain http://www.gap-system.org/lib?coll?IsCollection
 implies http://www.gap-system.org/lib?domain?IsDomain http://www.gap-system.org/lib?domain?IsGeneralizedDomain
+dataconstructor http://www.gap-system.org/lib?domain?IsGeneralizedDomain
+dataconstructor http://www.gap-system.org/lib?domain?ParentAttr
+dataconstructor http://www.gap-system.org/lib?domain?GeneratorsOfDomain
+dataconstructor http://www.gap-system.org/lib?domain?DomainByGenerators
+dataconstructor http://www.gap-system.org/lib?domain?IsDomain
 theory http://www.gap-system.org/lib?domain
 HasMeta http://www.gap-system.org/lib?domain http://www.gap-system.org/?Types
 Declares http://www.gap-system.org/lib?domain http://www.gap-system.org/lib?domain?IsGeneralizedDomain
 constant http://www.gap-system.org/lib?domain?IsGeneralizedDomain
 Includes http://www.gap-system.org/lib?domain http://www.gap-system.org/lib?coll
-Includes http://www.gap-system.org/lib?domain http://www.gap-system.org/lib?domain
 Declares http://www.gap-system.org/lib?domain http://www.gap-system.org/lib?domain?ParentAttr
 constant http://www.gap-system.org/lib?domain?ParentAttr
 Declares http://www.gap-system.org/lib?domain http://www.gap-system.org/lib?domain?GeneratorsOfDomain
diff --git a/relational/http..www.gap-system.org/lib/extaset.rel b/relational/http..www.gap-system.org/lib/extaset.rel
index 31281e3dc0dae6d29f58c17a1ae6548cc1d16649..b418125bb1d41dc2ee8e00d251604fcfd66ce7b1 100644
--- a/relational/http..www.gap-system.org/lib/extaset.rel
+++ b/relational/http..www.gap-system.org/lib/extaset.rel
@@ -37,6 +37,47 @@ implies http://www.gap-system.org/lib?extaset?IsAssociativeAOpDSum_st8 http://ww
 implies http://www.gap-system.org/lib?extaset?IsAssociativeAOpDSum_st8 http://www.gap-system.org/lib?extaset?IsExtASet
 IsAttribute http://www.gap-system.org/lib?extaset?AdditivelyActingDomain
 implies http://www.gap-system.org/lib?extaset?AdditivelyActingDomain http://www.gap-system.org/lib?extaset?IsExtASet
+dataconstructor http://www.gap-system.org/lib?extaset?IsExtASet
+dataconstructor http://www.gap-system.org/lib?extaset?IsExtASet_st0
+dataconstructor http://www.gap-system.org/lib?extaset?IsExtASet_st1
+dataconstructor http://www.gap-system.org/lib?extaset?IsExtASet_st2
+dataconstructor http://www.gap-system.org/lib?extaset?IsExtASet_st3
+dataconstructor http://www.gap-system.org/lib?extaset?IsExtASet_st4
+dataconstructor http://www.gap-system.org/lib?extaset?IsExtASet_st5
+dataconstructor http://www.gap-system.org/lib?extaset?IsExtASet_st6
+dataconstructor http://www.gap-system.org/lib?extaset?IsExtASet_st7
+dataconstructor http://www.gap-system.org/lib?extaset?IsAssociativeAOpESum
+dataconstructor http://www.gap-system.org/lib?extaset?IsAssociativeAOpESum_st0
+dataconstructor http://www.gap-system.org/lib?extaset?IsAssociativeAOpESum_st1
+dataconstructor http://www.gap-system.org/lib?extaset?IsAssociativeAOpESum_st2
+dataconstructor http://www.gap-system.org/lib?extaset?IsAssociativeAOpESum_st3
+dataconstructor http://www.gap-system.org/lib?extaset?IsAssociativeAOpESum_st4
+dataconstructor http://www.gap-system.org/lib?extaset?IsAssociativeAOpESum_st5
+dataconstructor http://www.gap-system.org/lib?extaset?IsAssociativeAOpESum_st6
+dataconstructor http://www.gap-system.org/lib?extaset?IsAssociativeAOpESum_st7
+dataconstructor http://www.gap-system.org/lib?extaset?IsAssociativeAOpESum_st8
+dataconstructor http://www.gap-system.org/lib?extaset?IsTrivialAOpEZero
+dataconstructor http://www.gap-system.org/lib?extaset?IsTrivialAOpEZero_st0
+dataconstructor http://www.gap-system.org/lib?extaset?IsTrivialAOpEZero_st1
+dataconstructor http://www.gap-system.org/lib?extaset?IsTrivialAOpEZero_st2
+dataconstructor http://www.gap-system.org/lib?extaset?IsTrivialAOpEZero_st3
+dataconstructor http://www.gap-system.org/lib?extaset?IsTrivialAOpEZero_st4
+dataconstructor http://www.gap-system.org/lib?extaset?IsTrivialAOpEZero_st5
+dataconstructor http://www.gap-system.org/lib?extaset?IsTrivialAOpEZero_st6
+dataconstructor http://www.gap-system.org/lib?extaset?IsTrivialAOpEZero_st7
+dataconstructor http://www.gap-system.org/lib?extaset?IsTrivialAOpEZero_st8
+dataconstructor http://www.gap-system.org/lib?extaset?GeneratorsOfExtASet
+dataconstructor http://www.gap-system.org/lib?extaset?IsAssociativeAOpDSum
+dataconstructor http://www.gap-system.org/lib?extaset?IsAssociativeAOpDSum_st0
+dataconstructor http://www.gap-system.org/lib?extaset?IsAssociativeAOpDSum_st1
+dataconstructor http://www.gap-system.org/lib?extaset?IsAssociativeAOpDSum_st2
+dataconstructor http://www.gap-system.org/lib?extaset?IsAssociativeAOpDSum_st3
+dataconstructor http://www.gap-system.org/lib?extaset?IsAssociativeAOpDSum_st4
+dataconstructor http://www.gap-system.org/lib?extaset?IsAssociativeAOpDSum_st5
+dataconstructor http://www.gap-system.org/lib?extaset?IsAssociativeAOpDSum_st6
+dataconstructor http://www.gap-system.org/lib?extaset?IsAssociativeAOpDSum_st7
+dataconstructor http://www.gap-system.org/lib?extaset?IsAssociativeAOpDSum_st8
+dataconstructor http://www.gap-system.org/lib?extaset?AdditivelyActingDomain
 theory http://www.gap-system.org/lib?extaset
 HasMeta http://www.gap-system.org/lib?extaset http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?extaset http://www.gap-system.org/lib?coll
@@ -61,7 +102,6 @@ Declares http://www.gap-system.org/lib?extaset http://www.gap-system.org/lib?ext
 constant http://www.gap-system.org/lib?extaset?IsExtASet_st6
 Declares http://www.gap-system.org/lib?extaset http://www.gap-system.org/lib?extaset?IsExtASet_st7
 constant http://www.gap-system.org/lib?extaset?IsExtASet_st7
-Includes http://www.gap-system.org/lib?extaset http://www.gap-system.org/lib?extaset
 Declares http://www.gap-system.org/lib?extaset http://www.gap-system.org/lib?extaset?IsAssociativeAOpESum
 constant http://www.gap-system.org/lib?extaset?IsAssociativeAOpESum
 Declares http://www.gap-system.org/lib?extaset http://www.gap-system.org/lib?extaset?IsAssociativeAOpESum_st0
diff --git a/relational/http..www.gap-system.org/lib/extlset.rel b/relational/http..www.gap-system.org/lib/extlset.rel
index 3510e4754877cc331717379b0eadd6ab596ba314..e8aef5c41cf2a4eb988e6f0071e47f6f8d42f0cd 100644
--- a/relational/http..www.gap-system.org/lib/extlset.rel
+++ b/relational/http..www.gap-system.org/lib/extlset.rel
@@ -70,6 +70,85 @@ implies http://www.gap-system.org/lib?extlset?IsDistributiveLOpDProd_st5 http://
 implies http://www.gap-system.org/lib?extlset?IsDistributiveLOpDProd_st5 http://www.gap-system.org/lib?list?IsDuplicateFree
 implies http://www.gap-system.org/lib?extlset?IsDistributiveLOpDProd_st5 http://www.gap-system.org/lib?domain?IsGeneralizedDomain
 implies http://www.gap-system.org/lib?extlset?IsDistributiveLOpDProd_st5 http://www.gap-system.org/lib?extlset?IsExtLSet
+dataconstructor http://www.gap-system.org/lib?extlset?IsExtLSet
+dataconstructor http://www.gap-system.org/lib?extlset?IsExtLSet_st0
+dataconstructor http://www.gap-system.org/lib?extlset?IsExtLSet_st1
+dataconstructor http://www.gap-system.org/lib?extlset?IsExtLSet_st2
+dataconstructor http://www.gap-system.org/lib?extlset?IsExtLSet_st3
+dataconstructor http://www.gap-system.org/lib?extlset?IsExtLSet_st4
+dataconstructor http://www.gap-system.org/lib?extlset?IsAssociativeLOpDProd
+dataconstructor http://www.gap-system.org/lib?extlset?IsAssociativeLOpDProd_st0
+dataconstructor http://www.gap-system.org/lib?extlset?IsAssociativeLOpDProd_st1
+dataconstructor http://www.gap-system.org/lib?extlset?IsAssociativeLOpDProd_st2
+dataconstructor http://www.gap-system.org/lib?extlset?IsAssociativeLOpDProd_st3
+dataconstructor http://www.gap-system.org/lib?extlset?IsAssociativeLOpDProd_st4
+dataconstructor http://www.gap-system.org/lib?extlset?IsAssociativeLOpDProd_st5
+dataconstructor http://www.gap-system.org/lib?extlset?IsAssociativeLOpEProd
+dataconstructor http://www.gap-system.org/lib?extlset?IsAssociativeLOpEProd_st0
+dataconstructor http://www.gap-system.org/lib?extlset?IsAssociativeLOpEProd_st1
+dataconstructor http://www.gap-system.org/lib?extlset?IsAssociativeLOpEProd_st2
+dataconstructor http://www.gap-system.org/lib?extlset?IsAssociativeLOpEProd_st3
+dataconstructor http://www.gap-system.org/lib?extlset?IsAssociativeLOpEProd_st4
+dataconstructor http://www.gap-system.org/lib?extlset?IsAssociativeLOpEProd_st5
+dataconstructor http://www.gap-system.org/lib?extlset?IsDistributiveLOpDSum
+dataconstructor http://www.gap-system.org/lib?extlset?IsDistributiveLOpDSum_st0
+dataconstructor http://www.gap-system.org/lib?extlset?IsDistributiveLOpDSum_st1
+dataconstructor http://www.gap-system.org/lib?extlset?IsDistributiveLOpDSum_st2
+dataconstructor http://www.gap-system.org/lib?extlset?IsDistributiveLOpDSum_st3
+dataconstructor http://www.gap-system.org/lib?extlset?IsDistributiveLOpDSum_st4
+dataconstructor http://www.gap-system.org/lib?extlset?IsDistributiveLOpDSum_st5
+dataconstructor http://www.gap-system.org/lib?extlset?IsDistributiveLOpESum
+dataconstructor http://www.gap-system.org/lib?extlset?IsDistributiveLOpESum_st0
+dataconstructor http://www.gap-system.org/lib?extlset?IsDistributiveLOpESum_st1
+dataconstructor http://www.gap-system.org/lib?extlset?IsDistributiveLOpESum_st2
+dataconstructor http://www.gap-system.org/lib?extlset?IsDistributiveLOpESum_st3
+dataconstructor http://www.gap-system.org/lib?extlset?IsDistributiveLOpESum_st4
+dataconstructor http://www.gap-system.org/lib?extlset?IsDistributiveLOpESum_st5
+dataconstructor http://www.gap-system.org/lib?extlset?IsTrivialLOpEOne
+dataconstructor http://www.gap-system.org/lib?extlset?IsTrivialLOpEOne_st0
+dataconstructor http://www.gap-system.org/lib?extlset?IsTrivialLOpEOne_st1
+dataconstructor http://www.gap-system.org/lib?extlset?IsTrivialLOpEOne_st2
+dataconstructor http://www.gap-system.org/lib?extlset?IsTrivialLOpEOne_st3
+dataconstructor http://www.gap-system.org/lib?extlset?IsTrivialLOpEOne_st4
+dataconstructor http://www.gap-system.org/lib?extlset?IsTrivialLOpEOne_st5
+dataconstructor http://www.gap-system.org/lib?extlset?IsLeftActedOnByRing
+dataconstructor http://www.gap-system.org/lib?extlset?IsLeftActedOnByRing_st0
+dataconstructor http://www.gap-system.org/lib?extlset?IsLeftActedOnByRing_st1
+dataconstructor http://www.gap-system.org/lib?extlset?IsLeftActedOnByRing_st2
+dataconstructor http://www.gap-system.org/lib?extlset?IsLeftActedOnByRing_st3
+dataconstructor http://www.gap-system.org/lib?extlset?IsLeftActedOnByRing_st4
+dataconstructor http://www.gap-system.org/lib?extlset?IsLeftActedOnByRing_st5
+dataconstructor http://www.gap-system.org/lib?extlset?IsLeftActedOnByDivisionRing
+dataconstructor http://www.gap-system.org/lib?extlset?IsDistributiveLOpEProd
+dataconstructor http://www.gap-system.org/lib?extlset?IsDistributiveLOpEProd_st0
+dataconstructor http://www.gap-system.org/lib?extlset?IsDistributiveLOpEProd_st1
+dataconstructor http://www.gap-system.org/lib?extlset?IsDistributiveLOpEProd_st2
+dataconstructor http://www.gap-system.org/lib?extlset?IsDistributiveLOpEProd_st3
+dataconstructor http://www.gap-system.org/lib?extlset?IsDistributiveLOpEProd_st4
+dataconstructor http://www.gap-system.org/lib?extlset?IsDistributiveLOpEProd_st5
+dataconstructor http://www.gap-system.org/lib?extlset?IsTrivialLOpEZero
+dataconstructor http://www.gap-system.org/lib?extlset?IsTrivialLOpEZero_st0
+dataconstructor http://www.gap-system.org/lib?extlset?IsTrivialLOpEZero_st1
+dataconstructor http://www.gap-system.org/lib?extlset?IsTrivialLOpEZero_st2
+dataconstructor http://www.gap-system.org/lib?extlset?IsTrivialLOpEZero_st3
+dataconstructor http://www.gap-system.org/lib?extlset?IsTrivialLOpEZero_st4
+dataconstructor http://www.gap-system.org/lib?extlset?IsTrivialLOpEZero_st5
+dataconstructor http://www.gap-system.org/lib?extlset?IsLeftActedOnBySuperset
+dataconstructor http://www.gap-system.org/lib?extlset?IsLeftActedOnBySuperset_st0
+dataconstructor http://www.gap-system.org/lib?extlset?IsLeftActedOnBySuperset_st1
+dataconstructor http://www.gap-system.org/lib?extlset?IsLeftActedOnBySuperset_st2
+dataconstructor http://www.gap-system.org/lib?extlset?IsLeftActedOnBySuperset_st3
+dataconstructor http://www.gap-system.org/lib?extlset?IsLeftActedOnBySuperset_st4
+dataconstructor http://www.gap-system.org/lib?extlset?IsLeftActedOnBySuperset_st5
+dataconstructor http://www.gap-system.org/lib?extlset?GeneratorsOfExtLSet
+dataconstructor http://www.gap-system.org/lib?extlset?LeftActingDomain
+dataconstructor http://www.gap-system.org/lib?extlset?IsDistributiveLOpDProd
+dataconstructor http://www.gap-system.org/lib?extlset?IsDistributiveLOpDProd_st0
+dataconstructor http://www.gap-system.org/lib?extlset?IsDistributiveLOpDProd_st1
+dataconstructor http://www.gap-system.org/lib?extlset?IsDistributiveLOpDProd_st2
+dataconstructor http://www.gap-system.org/lib?extlset?IsDistributiveLOpDProd_st3
+dataconstructor http://www.gap-system.org/lib?extlset?IsDistributiveLOpDProd_st4
+dataconstructor http://www.gap-system.org/lib?extlset?IsDistributiveLOpDProd_st5
 theory http://www.gap-system.org/lib?extlset
 HasMeta http://www.gap-system.org/lib?extlset http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?extlset http://www.gap-system.org/lib?coll
@@ -87,7 +166,6 @@ Declares http://www.gap-system.org/lib?extlset http://www.gap-system.org/lib?ext
 constant http://www.gap-system.org/lib?extlset?IsExtLSet_st3
 Declares http://www.gap-system.org/lib?extlset http://www.gap-system.org/lib?extlset?IsExtLSet_st4
 constant http://www.gap-system.org/lib?extlset?IsExtLSet_st4
-Includes http://www.gap-system.org/lib?extlset http://www.gap-system.org/lib?extlset
 Declares http://www.gap-system.org/lib?extlset http://www.gap-system.org/lib?extlset?IsAssociativeLOpDProd
 constant http://www.gap-system.org/lib?extlset?IsAssociativeLOpDProd
 Declares http://www.gap-system.org/lib?extlset http://www.gap-system.org/lib?extlset?IsAssociativeLOpDProd_st0
diff --git a/relational/http..www.gap-system.org/lib/extrset.rel b/relational/http..www.gap-system.org/lib/extrset.rel
index 8277810256ca41f1f9b871201e75fb94d124dd41..a06cc877897af541b16b7f4faae75294cc58c657 100644
--- a/relational/http..www.gap-system.org/lib/extrset.rel
+++ b/relational/http..www.gap-system.org/lib/extrset.rel
@@ -74,6 +74,92 @@ implies http://www.gap-system.org/lib?extrset?IsDistributiveROpEProd_st5 http://
 implies http://www.gap-system.org/lib?extrset?IsDistributiveROpEProd_st5 http://www.gap-system.org/lib?list?IsDuplicateFree
 implies http://www.gap-system.org/lib?extrset?IsDistributiveROpEProd_st5 http://www.gap-system.org/lib?domain?IsGeneralizedDomain
 implies http://www.gap-system.org/lib?extrset?IsDistributiveROpEProd_st5 http://www.gap-system.org/lib?extrset?IsExtRSet
+dataconstructor http://www.gap-system.org/lib?extrset?IsExtRSet
+dataconstructor http://www.gap-system.org/lib?extrset?IsExtRSet_st0
+dataconstructor http://www.gap-system.org/lib?extrset?IsExtRSet_st1
+dataconstructor http://www.gap-system.org/lib?extrset?IsExtRSet_st2
+dataconstructor http://www.gap-system.org/lib?extrset?IsExtRSet_st3
+dataconstructor http://www.gap-system.org/lib?extrset?IsExtRSet_st4
+dataconstructor http://www.gap-system.org/lib?extrset?IsRightActedOnBySuperset
+dataconstructor http://www.gap-system.org/lib?extrset?IsRightActedOnBySuperset_st0
+dataconstructor http://www.gap-system.org/lib?extrset?IsRightActedOnBySuperset_st1
+dataconstructor http://www.gap-system.org/lib?extrset?IsRightActedOnBySuperset_st2
+dataconstructor http://www.gap-system.org/lib?extrset?IsRightActedOnBySuperset_st3
+dataconstructor http://www.gap-system.org/lib?extrset?IsRightActedOnBySuperset_st4
+dataconstructor http://www.gap-system.org/lib?extrset?IsRightActedOnBySuperset_st5
+dataconstructor http://www.gap-system.org/lib?extrset?IsAssociativeROpEProd
+dataconstructor http://www.gap-system.org/lib?extrset?IsAssociativeROpEProd_st0
+dataconstructor http://www.gap-system.org/lib?extrset?IsAssociativeROpEProd_st1
+dataconstructor http://www.gap-system.org/lib?extrset?IsAssociativeROpEProd_st2
+dataconstructor http://www.gap-system.org/lib?extrset?IsAssociativeROpEProd_st3
+dataconstructor http://www.gap-system.org/lib?extrset?IsAssociativeROpEProd_st4
+dataconstructor http://www.gap-system.org/lib?extrset?IsAssociativeROpEProd_st5
+dataconstructor http://www.gap-system.org/lib?extrset?IsDistributiveROpDSum
+dataconstructor http://www.gap-system.org/lib?extrset?IsDistributiveROpDSum_st0
+dataconstructor http://www.gap-system.org/lib?extrset?IsDistributiveROpDSum_st1
+dataconstructor http://www.gap-system.org/lib?extrset?IsDistributiveROpDSum_st2
+dataconstructor http://www.gap-system.org/lib?extrset?IsDistributiveROpDSum_st3
+dataconstructor http://www.gap-system.org/lib?extrset?IsDistributiveROpDSum_st4
+dataconstructor http://www.gap-system.org/lib?extrset?IsDistributiveROpDSum_st5
+dataconstructor http://www.gap-system.org/lib?extrset?IsDistributiveROpESum
+dataconstructor http://www.gap-system.org/lib?extrset?IsDistributiveROpESum_st0
+dataconstructor http://www.gap-system.org/lib?extrset?IsDistributiveROpESum_st1
+dataconstructor http://www.gap-system.org/lib?extrset?IsDistributiveROpESum_st2
+dataconstructor http://www.gap-system.org/lib?extrset?IsDistributiveROpESum_st3
+dataconstructor http://www.gap-system.org/lib?extrset?IsDistributiveROpESum_st4
+dataconstructor http://www.gap-system.org/lib?extrset?IsDistributiveROpESum_st5
+dataconstructor http://www.gap-system.org/lib?extrset?IsTrivialROpEOne
+dataconstructor http://www.gap-system.org/lib?extrset?IsTrivialROpEOne_st0
+dataconstructor http://www.gap-system.org/lib?extrset?IsTrivialROpEOne_st1
+dataconstructor http://www.gap-system.org/lib?extrset?IsTrivialROpEOne_st2
+dataconstructor http://www.gap-system.org/lib?extrset?IsTrivialROpEOne_st3
+dataconstructor http://www.gap-system.org/lib?extrset?IsTrivialROpEOne_st4
+dataconstructor http://www.gap-system.org/lib?extrset?IsTrivialROpEOne_st5
+dataconstructor http://www.gap-system.org/lib?extrset?IsRightActedOnByRing
+dataconstructor http://www.gap-system.org/lib?extrset?IsRightActedOnByRing_st0
+dataconstructor http://www.gap-system.org/lib?extrset?IsRightActedOnByRing_st1
+dataconstructor http://www.gap-system.org/lib?extrset?IsRightActedOnByRing_st2
+dataconstructor http://www.gap-system.org/lib?extrset?IsRightActedOnByRing_st3
+dataconstructor http://www.gap-system.org/lib?extrset?IsRightActedOnByRing_st4
+dataconstructor http://www.gap-system.org/lib?extrset?IsRightActedOnByRing_st5
+dataconstructor http://www.gap-system.org/lib?extrset?RightActingDomain
+dataconstructor http://www.gap-system.org/lib?extrset?GeneratorsOfExtRSet
+dataconstructor http://www.gap-system.org/lib?extrset?IsTrivialROpEZero
+dataconstructor http://www.gap-system.org/lib?extrset?IsTrivialROpEZero_st0
+dataconstructor http://www.gap-system.org/lib?extrset?IsTrivialROpEZero_st1
+dataconstructor http://www.gap-system.org/lib?extrset?IsTrivialROpEZero_st2
+dataconstructor http://www.gap-system.org/lib?extrset?IsTrivialROpEZero_st3
+dataconstructor http://www.gap-system.org/lib?extrset?IsTrivialROpEZero_st4
+dataconstructor http://www.gap-system.org/lib?extrset?IsTrivialROpEZero_st5
+dataconstructor http://www.gap-system.org/lib?extrset?IsDistributiveROpDProd
+dataconstructor http://www.gap-system.org/lib?extrset?IsDistributiveROpDProd_st0
+dataconstructor http://www.gap-system.org/lib?extrset?IsDistributiveROpDProd_st1
+dataconstructor http://www.gap-system.org/lib?extrset?IsDistributiveROpDProd_st2
+dataconstructor http://www.gap-system.org/lib?extrset?IsDistributiveROpDProd_st3
+dataconstructor http://www.gap-system.org/lib?extrset?IsDistributiveROpDProd_st4
+dataconstructor http://www.gap-system.org/lib?extrset?IsDistributiveROpDProd_st5
+dataconstructor http://www.gap-system.org/lib?extrset?IsRightActedOnByDivisionRing
+dataconstructor http://www.gap-system.org/lib?extrset?IsRightActedOnByDivisionRing_st0
+dataconstructor http://www.gap-system.org/lib?extrset?IsRightActedOnByDivisionRing_st1
+dataconstructor http://www.gap-system.org/lib?extrset?IsRightActedOnByDivisionRing_st2
+dataconstructor http://www.gap-system.org/lib?extrset?IsRightActedOnByDivisionRing_st3
+dataconstructor http://www.gap-system.org/lib?extrset?IsRightActedOnByDivisionRing_st4
+dataconstructor http://www.gap-system.org/lib?extrset?IsRightActedOnByDivisionRing_st5
+dataconstructor http://www.gap-system.org/lib?extrset?IsRightActedOnByDivisionRing_st6
+dataconstructor http://www.gap-system.org/lib?extrset?IsAssociativeROpDProd
+dataconstructor http://www.gap-system.org/lib?extrset?IsAssociativeROpDProd_st0
+dataconstructor http://www.gap-system.org/lib?extrset?IsAssociativeROpDProd_st1
+dataconstructor http://www.gap-system.org/lib?extrset?IsAssociativeROpDProd_st2
+dataconstructor http://www.gap-system.org/lib?extrset?IsAssociativeROpDProd_st3
+dataconstructor http://www.gap-system.org/lib?extrset?IsAssociativeROpDProd_st4
+dataconstructor http://www.gap-system.org/lib?extrset?IsAssociativeROpDProd_st5
+dataconstructor http://www.gap-system.org/lib?extrset?IsDistributiveROpEProd
+dataconstructor http://www.gap-system.org/lib?extrset?IsDistributiveROpEProd_st0
+dataconstructor http://www.gap-system.org/lib?extrset?IsDistributiveROpEProd_st1
+dataconstructor http://www.gap-system.org/lib?extrset?IsDistributiveROpEProd_st2
+dataconstructor http://www.gap-system.org/lib?extrset?IsDistributiveROpEProd_st3
+dataconstructor http://www.gap-system.org/lib?extrset?IsDistributiveROpEProd_st4
+dataconstructor http://www.gap-system.org/lib?extrset?IsDistributiveROpEProd_st5
 theory http://www.gap-system.org/lib?extrset
 HasMeta http://www.gap-system.org/lib?extrset http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?extrset http://www.gap-system.org/lib?coll
@@ -91,7 +177,6 @@ Declares http://www.gap-system.org/lib?extrset http://www.gap-system.org/lib?ext
 constant http://www.gap-system.org/lib?extrset?IsExtRSet_st3
 Declares http://www.gap-system.org/lib?extrset http://www.gap-system.org/lib?extrset?IsExtRSet_st4
 constant http://www.gap-system.org/lib?extrset?IsExtRSet_st4
-Includes http://www.gap-system.org/lib?extrset http://www.gap-system.org/lib?extrset
 Declares http://www.gap-system.org/lib?extrset http://www.gap-system.org/lib?extrset?IsRightActedOnBySuperset
 constant http://www.gap-system.org/lib?extrset?IsRightActedOnBySuperset
 Declares http://www.gap-system.org/lib?extrset http://www.gap-system.org/lib?extrset?IsRightActedOnBySuperset_st0
diff --git a/relational/http..www.gap-system.org/lib/extuset.rel b/relational/http..www.gap-system.org/lib/extuset.rel
index 1733484df8b2de4f0705bb91a5aef50c9dded30d..7f3e56e130c569705bdeae4f986c6e9758b92e63 100644
--- a/relational/http..www.gap-system.org/lib/extuset.rel
+++ b/relational/http..www.gap-system.org/lib/extuset.rel
@@ -67,6 +67,84 @@ implies http://www.gap-system.org/lib?extuset?IsUpperActedOnByGroup_st5 http://w
 implies http://www.gap-system.org/lib?extuset?IsUpperActedOnByGroup_st5 http://www.gap-system.org/lib?list?IsDuplicateFree
 implies http://www.gap-system.org/lib?extuset?IsUpperActedOnByGroup_st5 http://www.gap-system.org/lib?domain?IsGeneralizedDomain
 implies http://www.gap-system.org/lib?extuset?IsUpperActedOnByGroup_st5 http://www.gap-system.org/lib?extuset?IsExtUSet
+dataconstructor http://www.gap-system.org/lib?extuset?IsExtUSet
+dataconstructor http://www.gap-system.org/lib?extuset?IsExtUSet_st0
+dataconstructor http://www.gap-system.org/lib?extuset?IsExtUSet_st1
+dataconstructor http://www.gap-system.org/lib?extuset?IsExtUSet_st2
+dataconstructor http://www.gap-system.org/lib?extuset?IsExtUSet_st3
+dataconstructor http://www.gap-system.org/lib?extuset?IsExtUSet_st4
+dataconstructor http://www.gap-system.org/lib?extuset?IsTrivialUOpEOne
+dataconstructor http://www.gap-system.org/lib?extuset?IsTrivialUOpEOne_st0
+dataconstructor http://www.gap-system.org/lib?extuset?IsTrivialUOpEOne_st1
+dataconstructor http://www.gap-system.org/lib?extuset?IsTrivialUOpEOne_st2
+dataconstructor http://www.gap-system.org/lib?extuset?IsTrivialUOpEOne_st3
+dataconstructor http://www.gap-system.org/lib?extuset?IsTrivialUOpEOne_st4
+dataconstructor http://www.gap-system.org/lib?extuset?IsTrivialUOpEOne_st5
+dataconstructor http://www.gap-system.org/lib?extuset?UpperActingDomain
+dataconstructor http://www.gap-system.org/lib?extuset?IsDistributiveUOpDSum
+dataconstructor http://www.gap-system.org/lib?extuset?IsDistributiveUOpDSum_st0
+dataconstructor http://www.gap-system.org/lib?extuset?IsDistributiveUOpDSum_st1
+dataconstructor http://www.gap-system.org/lib?extuset?IsDistributiveUOpDSum_st2
+dataconstructor http://www.gap-system.org/lib?extuset?IsDistributiveUOpDSum_st3
+dataconstructor http://www.gap-system.org/lib?extuset?IsDistributiveUOpDSum_st4
+dataconstructor http://www.gap-system.org/lib?extuset?IsDistributiveUOpDSum_st5
+dataconstructor http://www.gap-system.org/lib?extuset?IsDistributiveUOpESum
+dataconstructor http://www.gap-system.org/lib?extuset?IsDistributiveUOpESum_st0
+dataconstructor http://www.gap-system.org/lib?extuset?IsDistributiveUOpESum_st1
+dataconstructor http://www.gap-system.org/lib?extuset?IsDistributiveUOpESum_st2
+dataconstructor http://www.gap-system.org/lib?extuset?IsDistributiveUOpESum_st3
+dataconstructor http://www.gap-system.org/lib?extuset?IsDistributiveUOpESum_st4
+dataconstructor http://www.gap-system.org/lib?extuset?IsDistributiveUOpESum_st5
+dataconstructor http://www.gap-system.org/lib?extuset?IsTrivialUOpEZero
+dataconstructor http://www.gap-system.org/lib?extuset?IsTrivialUOpEZero_st0
+dataconstructor http://www.gap-system.org/lib?extuset?IsTrivialUOpEZero_st1
+dataconstructor http://www.gap-system.org/lib?extuset?IsTrivialUOpEZero_st2
+dataconstructor http://www.gap-system.org/lib?extuset?IsTrivialUOpEZero_st3
+dataconstructor http://www.gap-system.org/lib?extuset?IsTrivialUOpEZero_st4
+dataconstructor http://www.gap-system.org/lib?extuset?IsTrivialUOpEZero_st5
+dataconstructor http://www.gap-system.org/lib?extuset?IsDistributiveUOpEProd
+dataconstructor http://www.gap-system.org/lib?extuset?IsDistributiveUOpEProd_st0
+dataconstructor http://www.gap-system.org/lib?extuset?IsDistributiveUOpEProd_st1
+dataconstructor http://www.gap-system.org/lib?extuset?IsDistributiveUOpEProd_st2
+dataconstructor http://www.gap-system.org/lib?extuset?IsDistributiveUOpEProd_st3
+dataconstructor http://www.gap-system.org/lib?extuset?IsDistributiveUOpEProd_st4
+dataconstructor http://www.gap-system.org/lib?extuset?IsDistributiveUOpEProd_st5
+dataconstructor http://www.gap-system.org/lib?extuset?IsAssociativeUOpEProd
+dataconstructor http://www.gap-system.org/lib?extuset?IsAssociativeUOpEProd_st0
+dataconstructor http://www.gap-system.org/lib?extuset?IsAssociativeUOpEProd_st1
+dataconstructor http://www.gap-system.org/lib?extuset?IsAssociativeUOpEProd_st2
+dataconstructor http://www.gap-system.org/lib?extuset?IsAssociativeUOpEProd_st3
+dataconstructor http://www.gap-system.org/lib?extuset?IsAssociativeUOpEProd_st4
+dataconstructor http://www.gap-system.org/lib?extuset?IsAssociativeUOpEProd_st5
+dataconstructor http://www.gap-system.org/lib?extuset?GeneratorsOfExtUSet
+dataconstructor http://www.gap-system.org/lib?extuset?IsAssociativeUOpDProd
+dataconstructor http://www.gap-system.org/lib?extuset?IsAssociativeUOpDProd_st0
+dataconstructor http://www.gap-system.org/lib?extuset?IsAssociativeUOpDProd_st1
+dataconstructor http://www.gap-system.org/lib?extuset?IsAssociativeUOpDProd_st2
+dataconstructor http://www.gap-system.org/lib?extuset?IsAssociativeUOpDProd_st3
+dataconstructor http://www.gap-system.org/lib?extuset?IsAssociativeUOpDProd_st4
+dataconstructor http://www.gap-system.org/lib?extuset?IsAssociativeUOpDProd_st5
+dataconstructor http://www.gap-system.org/lib?extuset?IsUpperActedOnBySuperset
+dataconstructor http://www.gap-system.org/lib?extuset?IsUpperActedOnBySuperset_st0
+dataconstructor http://www.gap-system.org/lib?extuset?IsUpperActedOnBySuperset_st1
+dataconstructor http://www.gap-system.org/lib?extuset?IsUpperActedOnBySuperset_st2
+dataconstructor http://www.gap-system.org/lib?extuset?IsUpperActedOnBySuperset_st3
+dataconstructor http://www.gap-system.org/lib?extuset?IsUpperActedOnBySuperset_st4
+dataconstructor http://www.gap-system.org/lib?extuset?IsUpperActedOnBySuperset_st5
+dataconstructor http://www.gap-system.org/lib?extuset?IsDistributiveUOpDProd
+dataconstructor http://www.gap-system.org/lib?extuset?IsDistributiveUOpDProd_st0
+dataconstructor http://www.gap-system.org/lib?extuset?IsDistributiveUOpDProd_st1
+dataconstructor http://www.gap-system.org/lib?extuset?IsDistributiveUOpDProd_st2
+dataconstructor http://www.gap-system.org/lib?extuset?IsDistributiveUOpDProd_st3
+dataconstructor http://www.gap-system.org/lib?extuset?IsDistributiveUOpDProd_st4
+dataconstructor http://www.gap-system.org/lib?extuset?IsDistributiveUOpDProd_st5
+dataconstructor http://www.gap-system.org/lib?extuset?IsUpperActedOnByGroup
+dataconstructor http://www.gap-system.org/lib?extuset?IsUpperActedOnByGroup_st0
+dataconstructor http://www.gap-system.org/lib?extuset?IsUpperActedOnByGroup_st1
+dataconstructor http://www.gap-system.org/lib?extuset?IsUpperActedOnByGroup_st2
+dataconstructor http://www.gap-system.org/lib?extuset?IsUpperActedOnByGroup_st3
+dataconstructor http://www.gap-system.org/lib?extuset?IsUpperActedOnByGroup_st4
+dataconstructor http://www.gap-system.org/lib?extuset?IsUpperActedOnByGroup_st5
 theory http://www.gap-system.org/lib?extuset
 HasMeta http://www.gap-system.org/lib?extuset http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?extuset http://www.gap-system.org/lib?coll
@@ -84,7 +162,6 @@ Declares http://www.gap-system.org/lib?extuset http://www.gap-system.org/lib?ext
 constant http://www.gap-system.org/lib?extuset?IsExtUSet_st3
 Declares http://www.gap-system.org/lib?extuset http://www.gap-system.org/lib?extuset?IsExtUSet_st4
 constant http://www.gap-system.org/lib?extuset?IsExtUSet_st4
-Includes http://www.gap-system.org/lib?extuset http://www.gap-system.org/lib?extuset
 Declares http://www.gap-system.org/lib?extuset http://www.gap-system.org/lib?extuset?IsTrivialUOpEOne
 constant http://www.gap-system.org/lib?extuset?IsTrivialUOpEOne
 Declares http://www.gap-system.org/lib?extuset http://www.gap-system.org/lib?extuset?IsTrivialUOpEOne_st0
diff --git a/relational/http..www.gap-system.org/lib/factgrp.rel b/relational/http..www.gap-system.org/lib/factgrp.rel
index 7faac9de421a282fd8feb40dc3e08451f4549056..7b8a7ee526cdad93f59eb701ef67d3fd72257982 100644
--- a/relational/http..www.gap-system.org/lib/factgrp.rel
+++ b/relational/http..www.gap-system.org/lib/factgrp.rel
@@ -10,6 +10,10 @@ implies http://www.gap-system.org/lib?factgrp?NaturalHomomorphismsPool http://ww
 IsAttribute http://www.gap-system.org/lib?factgrp?DoCheapActionImages
 implies http://www.gap-system.org/lib?factgrp?DoCheapActionImages http://www.gap-system.org/lib?magma?IsMagmaWithInverses
 implies http://www.gap-system.org/lib?factgrp?DoCheapActionImages http://www.gap-system.org/lib?magma?IsAssociative
+dataconstructor http://www.gap-system.org/lib?factgrp?FindActionKernel
+dataconstructor http://www.gap-system.org/lib?factgrp?FactorCosetAction
+dataconstructor http://www.gap-system.org/lib?factgrp?NaturalHomomorphismsPool
+dataconstructor http://www.gap-system.org/lib?factgrp?DoCheapActionImages
 theory http://www.gap-system.org/lib?factgrp
 HasMeta http://www.gap-system.org/lib?factgrp http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?factgrp http://www.gap-system.org/lib?magma
diff --git a/relational/http..www.gap-system.org/lib/fastendo.rel b/relational/http..www.gap-system.org/lib/fastendo.rel
index 08cae57333dfc3eca1fd5c76404ec77546cecda2..b5943cc427551639e34078729e40234bca6ff431 100644
--- a/relational/http..www.gap-system.org/lib/fastendo.rel
+++ b/relational/http..www.gap-system.org/lib/fastendo.rel
@@ -6,6 +6,10 @@ implies http://www.gap-system.org/lib?fastendo?TransformationRepresentation http
 implies http://www.gap-system.org/lib?fastendo?TransformationRepresentation http://www.gap-system.org/lib?mapping?IsEndoGeneralMapping
 implies http://www.gap-system.org/lib?fastendo?TransformationRepresentation http://www.gap-system.org/lib?mapping?IsTotal
 implies http://www.gap-system.org/lib?fastendo?TransformationRepresentation http://www.gap-system.org/lib?mapping?IsSingleValued
+dataconstructor http://www.gap-system.org/lib?fastendo?IsTransformationRepOfEndo
+dataconstructor http://www.gap-system.org/lib?fastendo?IsTransformationRepOfEndo_st0
+dataconstructor http://www.gap-system.org/lib?fastendo?IsTransformationRepOfEndo_st1
+dataconstructor http://www.gap-system.org/lib?fastendo?TransformationRepresentation
 theory http://www.gap-system.org/lib?fastendo
 HasMeta http://www.gap-system.org/lib?fastendo http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?fastendo http://www.gap-system.org/lib?type
diff --git a/relational/http..www.gap-system.org/lib/ffe.rel b/relational/http..www.gap-system.org/lib/ffe.rel
index 79729269d047392acf74bed5709eee6cf685ce56..f45fe82e936c321ee8dc53d34177bd90717a341f 100644
--- a/relational/http..www.gap-system.org/lib/ffe.rel
+++ b/relational/http..www.gap-system.org/lib/ffe.rel
@@ -81,6 +81,66 @@ implies http://www.gap-system.org/lib?ffe?IntVecFFE http://www.gap-system.org/li
 IsAttribute http://www.gap-system.org/lib?ffe?PROD_FFE_LARGE
 implies http://www.gap-system.org/lib?ffe?PROD_FFE_LARGE http://www.gap-system.org/lib?ffe?IsFFE
 implies http://www.gap-system.org/lib?ffe?PROD_FFE_LARGE http://www.gap-system.org/lib?type?IsInternalRep
+dataconstructor http://www.gap-system.org/lib?ffe?IsFFE
+dataconstructor http://www.gap-system.org/lib?ffe?IsFFE_st0
+dataconstructor http://www.gap-system.org/lib?ffe?IsFFE_st1
+dataconstructor http://www.gap-system.org/lib?ffe?IsFFE_st2
+dataconstructor http://www.gap-system.org/lib?ffe?IsFFE_st3
+dataconstructor http://www.gap-system.org/lib?ffe?IsFFE_st4
+dataconstructor http://www.gap-system.org/lib?ffe?IsFFE_st5
+dataconstructor http://www.gap-system.org/lib?ffe?IsFFE_st6
+dataconstructor http://www.gap-system.org/lib?ffe?IsFFE_st7
+dataconstructor http://www.gap-system.org/lib?ffe?IsFFE_st8
+dataconstructor http://www.gap-system.org/lib?ffe?IsFFE_st9
+dataconstructor http://www.gap-system.org/lib?ffe?IsFFE_st10
+dataconstructor http://www.gap-system.org/lib?ffe?IsFFE_st11
+dataconstructor http://www.gap-system.org/lib?ffe?IsFFE_st12
+dataconstructor http://www.gap-system.org/lib?ffe?IsFFE_st13
+dataconstructor http://www.gap-system.org/lib?ffe?IsLogOrderedFFE
+dataconstructor http://www.gap-system.org/lib?ffe?IsLogOrderedFFE_st0
+dataconstructor http://www.gap-system.org/lib?ffe?IsLogOrderedFFE_st1
+dataconstructor http://www.gap-system.org/lib?ffe?IsLogOrderedFFE_st2
+dataconstructor http://www.gap-system.org/lib?ffe?IsLogOrderedFFE_st3
+dataconstructor http://www.gap-system.org/lib?ffe?IsLogOrderedFFE_st4
+dataconstructor http://www.gap-system.org/lib?ffe?IsLogOrderedFFE_st5
+dataconstructor http://www.gap-system.org/lib?ffe?IsLogOrderedFFE_st6
+dataconstructor http://www.gap-system.org/lib?ffe?IsLogOrderedFFE_st7
+dataconstructor http://www.gap-system.org/lib?ffe?IsLogOrderedFFE_st8
+dataconstructor http://www.gap-system.org/lib?ffe?IsLogOrderedFFE_st9
+dataconstructor http://www.gap-system.org/lib?ffe?IsLogOrderedFFE_st10
+dataconstructor http://www.gap-system.org/lib?ffe?IsLogOrderedFFE_st11
+dataconstructor http://www.gap-system.org/lib?ffe?IsLogOrderedFFE_st12
+dataconstructor http://www.gap-system.org/lib?ffe?IsLogOrderedFFE_st13
+dataconstructor http://www.gap-system.org/lib?ffe?IsLogOrderedFFE_st14
+dataconstructor http://www.gap-system.org/lib?ffe?AsInternalFFE
+dataconstructor http://www.gap-system.org/lib?ffe?IntFFE
+dataconstructor http://www.gap-system.org/lib?ffe?DegreeFFE
+dataconstructor http://www.gap-system.org/lib?ffe?DIFF_FFE_LARGE
+dataconstructor http://www.gap-system.org/lib?ffe?LargeGaloisField
+dataconstructor http://www.gap-system.org/lib?ffe?ZOp
+dataconstructor http://www.gap-system.org/lib?ffe?IsLexOrderedFFE
+dataconstructor http://www.gap-system.org/lib?ffe?IsLexOrderedFFE_st0
+dataconstructor http://www.gap-system.org/lib?ffe?IsLexOrderedFFE_st1
+dataconstructor http://www.gap-system.org/lib?ffe?IsLexOrderedFFE_st2
+dataconstructor http://www.gap-system.org/lib?ffe?IsLexOrderedFFE_st3
+dataconstructor http://www.gap-system.org/lib?ffe?IsLexOrderedFFE_st4
+dataconstructor http://www.gap-system.org/lib?ffe?IsLexOrderedFFE_st5
+dataconstructor http://www.gap-system.org/lib?ffe?IsLexOrderedFFE_st6
+dataconstructor http://www.gap-system.org/lib?ffe?IsLexOrderedFFE_st7
+dataconstructor http://www.gap-system.org/lib?ffe?IsLexOrderedFFE_st8
+dataconstructor http://www.gap-system.org/lib?ffe?IsLexOrderedFFE_st9
+dataconstructor http://www.gap-system.org/lib?ffe?IsLexOrderedFFE_st10
+dataconstructor http://www.gap-system.org/lib?ffe?IsLexOrderedFFE_st11
+dataconstructor http://www.gap-system.org/lib?ffe?IsLexOrderedFFE_st12
+dataconstructor http://www.gap-system.org/lib?ffe?IsLexOrderedFFE_st13
+dataconstructor http://www.gap-system.org/lib?ffe?IsLexOrderedFFE_st14
+dataconstructor http://www.gap-system.org/lib?ffe?RootFFE
+dataconstructor http://www.gap-system.org/lib?ffe?QUO_FFE_LARGE
+dataconstructor http://www.gap-system.org/lib?ffe?IntFFESymm
+dataconstructor http://www.gap-system.org/lib?ffe?LogFFE
+dataconstructor http://www.gap-system.org/lib?ffe?SUM_FFE_LARGE
+dataconstructor http://www.gap-system.org/lib?ffe?IntVecFFE
+dataconstructor http://www.gap-system.org/lib?ffe?PROD_FFE_LARGE
 theory http://www.gap-system.org/lib?ffe
 HasMeta http://www.gap-system.org/lib?ffe http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?ffe http://www.gap-system.org/lib?arith
@@ -114,7 +174,6 @@ Declares http://www.gap-system.org/lib?ffe http://www.gap-system.org/lib?ffe?IsF
 constant http://www.gap-system.org/lib?ffe?IsFFE_st12
 Declares http://www.gap-system.org/lib?ffe http://www.gap-system.org/lib?ffe?IsFFE_st13
 constant http://www.gap-system.org/lib?ffe?IsFFE_st13
-Includes http://www.gap-system.org/lib?ffe http://www.gap-system.org/lib?ffe
 Declares http://www.gap-system.org/lib?ffe http://www.gap-system.org/lib?ffe?IsLogOrderedFFE
 constant http://www.gap-system.org/lib?ffe?IsLogOrderedFFE
 Declares http://www.gap-system.org/lib?ffe http://www.gap-system.org/lib?ffe?IsLogOrderedFFE_st0
diff --git a/relational/http..www.gap-system.org/lib/ffeconway.rel b/relational/http..www.gap-system.org/lib/ffeconway.rel
index 9ba4f89d9705740ceba8ebc069d1c3503ea137a7..4d93a0b3b70d9d8ed611708a57cfe8042e0b045b 100644
--- a/relational/http..www.gap-system.org/lib/ffeconway.rel
+++ b/relational/http..www.gap-system.org/lib/ffeconway.rel
@@ -1,5 +1,7 @@
 IsFilter http://www.gap-system.org/lib?ffeconway?IsCoeffsModConwayPolRep
 implies http://www.gap-system.org/lib?ffeconway?IsCoeffsModConwayPolRep_st0 http://www.gap-system.org/lib?type?IsPositionalObjectRep
+dataconstructor http://www.gap-system.org/lib?ffeconway?IsCoeffsModConwayPolRep
+dataconstructor http://www.gap-system.org/lib?ffeconway?IsCoeffsModConwayPolRep_st0
 theory http://www.gap-system.org/lib?ffeconway
 HasMeta http://www.gap-system.org/lib?ffeconway http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?ffeconway http://www.gap-system.org/lib?type
diff --git a/relational/http..www.gap-system.org/lib/field.rel b/relational/http..www.gap-system.org/lib/field.rel
index 10c23036f7b41c85ff658f75cb7d4a8ca8d85a1f..29a43db32b11c39495c05b246a06c48972c27c25 100644
--- a/relational/http..www.gap-system.org/lib/field.rel
+++ b/relational/http..www.gap-system.org/lib/field.rel
@@ -569,6 +569,115 @@ implies http://www.gap-system.org/lib?field?Trace http://www.gap-system.org/lib?
 implies http://www.gap-system.org/lib?field?Trace http://www.gap-system.org/lib?semiring?IsLDistributive
 implies http://www.gap-system.org/lib?field?Trace http://www.gap-system.org/lib?semiring?IsRDistributive
 implies http://www.gap-system.org/lib?field?Trace http://www.gap-system.org/lib?ring?IsEuclideanRing
+dataconstructor http://www.gap-system.org/lib?field?IsField
+dataconstructor http://www.gap-system.org/lib?field?RealPart
+dataconstructor http://www.gap-system.org/lib?field?DivisionRingByGenerators
+dataconstructor http://www.gap-system.org/lib?field?NormalBase
+dataconstructor http://www.gap-system.org/lib?field?Conjugates
+dataconstructor http://www.gap-system.org/lib?field?ClosureDivisionRing
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st0
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st1
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st2
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st3
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st4
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st5
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st6
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st7
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st8
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st9
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st10
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st11
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st12
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st13
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st14
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st15
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st16
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st17
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st18
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st19
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st20
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st21
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st22
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st23
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st24
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st25
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st26
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st27
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st28
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st29
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st30
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st31
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st32
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st33
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st34
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st35
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st36
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st37
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st38
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st39
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st40
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st41
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st42
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st43
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st44
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st45
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st46
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st47
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st48
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st49
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st50
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st51
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st52
+dataconstructor http://www.gap-system.org/lib?field?IsFieldControlledByGaloisGroup_st53
+dataconstructor http://www.gap-system.org/lib?field?PrimeField
+dataconstructor http://www.gap-system.org/lib?field?TracePolynomial
+dataconstructor http://www.gap-system.org/lib?field?FieldOverItselfByGenerators
+dataconstructor http://www.gap-system.org/lib?field?IsFieldElementsSpace
+dataconstructor http://www.gap-system.org/lib?field?IsFieldElementsSpace_st0
+dataconstructor http://www.gap-system.org/lib?field?IsFieldElementsSpace_st1
+dataconstructor http://www.gap-system.org/lib?field?IsFieldElementsSpace_st2
+dataconstructor http://www.gap-system.org/lib?field?IsFieldElementsSpace_st3
+dataconstructor http://www.gap-system.org/lib?field?IsFieldElementsSpace_st4
+dataconstructor http://www.gap-system.org/lib?field?IsFieldElementsSpace_st5
+dataconstructor http://www.gap-system.org/lib?field?IsFieldElementsSpace_st6
+dataconstructor http://www.gap-system.org/lib?field?IsFieldElementsSpace_st7
+dataconstructor http://www.gap-system.org/lib?field?IsFieldElementsSpace_st8
+dataconstructor http://www.gap-system.org/lib?field?IsFieldElementsSpace_st9
+dataconstructor http://www.gap-system.org/lib?field?IsFieldElementsSpace_st10
+dataconstructor http://www.gap-system.org/lib?field?IsFieldElementsSpace_st11
+dataconstructor http://www.gap-system.org/lib?field?IsFieldElementsSpace_st12
+dataconstructor http://www.gap-system.org/lib?field?IsFieldElementsSpace_st13
+dataconstructor http://www.gap-system.org/lib?field?IsFieldElementsSpace_st14
+dataconstructor http://www.gap-system.org/lib?field?IsFieldElementsSpace_st15
+dataconstructor http://www.gap-system.org/lib?field?IsFieldElementsSpace_st16
+dataconstructor http://www.gap-system.org/lib?field?IsFieldElementsSpace_st17
+dataconstructor http://www.gap-system.org/lib?field?IsFieldElementsSpace_st18
+dataconstructor http://www.gap-system.org/lib?field?IsFieldElementsSpace_st19
+dataconstructor http://www.gap-system.org/lib?field?IsFieldElementsSpace_st20
+dataconstructor http://www.gap-system.org/lib?field?IsFieldElementsSpace_st21
+dataconstructor http://www.gap-system.org/lib?field?IsFieldElementsSpace_st22
+dataconstructor http://www.gap-system.org/lib?field?IsFieldElementsSpace_st23
+dataconstructor http://www.gap-system.org/lib?field?IsFieldElementsSpace_st24
+dataconstructor http://www.gap-system.org/lib?field?IsFieldElementsSpace_st25
+dataconstructor http://www.gap-system.org/lib?field?DefaultFieldByGenerators
+dataconstructor http://www.gap-system.org/lib?field?DefiningPolynomial
+dataconstructor http://www.gap-system.org/lib?field?DegreeOverPrimeField
+dataconstructor http://www.gap-system.org/lib?field?FrobeniusAutomorphism
+dataconstructor http://www.gap-system.org/lib?field?AsDivisionRing
+dataconstructor http://www.gap-system.org/lib?field?PrimitiveRoot
+dataconstructor http://www.gap-system.org/lib?field?Subfields
+dataconstructor http://www.gap-system.org/lib?field?NthRoot
+dataconstructor http://www.gap-system.org/lib?field?ComplexConjugate
+dataconstructor http://www.gap-system.org/lib?field?PrimitiveElement
+dataconstructor http://www.gap-system.org/lib?field?IsPrimeField
+dataconstructor http://www.gap-system.org/lib?field?GaloisGroup
+dataconstructor http://www.gap-system.org/lib?field?Norm
+dataconstructor http://www.gap-system.org/lib?field?ImaginaryPart
+dataconstructor http://www.gap-system.org/lib?field?RootOfDefiningPolynomial
+dataconstructor http://www.gap-system.org/lib?field?GeneratorsOfDivisionRing
+dataconstructor http://www.gap-system.org/lib?field?FieldExtension
+dataconstructor http://www.gap-system.org/lib?field?Trace
 theory http://www.gap-system.org/lib?field
 HasMeta http://www.gap-system.org/lib?field http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?field http://www.gap-system.org/lib?coll
diff --git a/relational/http..www.gap-system.org/lib/fieldfin.rel b/relational/http..www.gap-system.org/lib/fieldfin.rel
index c499a190ff3be737fd8520d6b72762949d26a715..9dff3ce32777cacdc526d38cefd477fc7558c3e3 100644
--- a/relational/http..www.gap-system.org/lib/fieldfin.rel
+++ b/relational/http..www.gap-system.org/lib/fieldfin.rel
@@ -19,6 +19,35 @@ implies http://www.gap-system.org/lib?fieldfin?IsFrobeniusAutomorphism_st24 http
 IsFilter http://www.gap-system.org/lib?fieldfin?IsBasisFiniteFieldRep
 implies http://www.gap-system.org/lib?fieldfin?IsBasisFiniteFieldRep_st1 http://www.gap-system.org/lib?type?IsComponentObjectRep
 implies http://www.gap-system.org/lib?fieldfin?IsBasisFiniteFieldRep_st1 http://www.gap-system.org/lib?type?IsAttributeStoringRep
+dataconstructor http://www.gap-system.org/lib?fieldfin?IsFrobeniusAutomorphism
+dataconstructor http://www.gap-system.org/lib?fieldfin?IsFrobeniusAutomorphism_st0
+dataconstructor http://www.gap-system.org/lib?fieldfin?IsFrobeniusAutomorphism_st1
+dataconstructor http://www.gap-system.org/lib?fieldfin?IsFrobeniusAutomorphism_st2
+dataconstructor http://www.gap-system.org/lib?fieldfin?IsFrobeniusAutomorphism_st3
+dataconstructor http://www.gap-system.org/lib?fieldfin?IsFrobeniusAutomorphism_st4
+dataconstructor http://www.gap-system.org/lib?fieldfin?IsFrobeniusAutomorphism_st5
+dataconstructor http://www.gap-system.org/lib?fieldfin?IsFrobeniusAutomorphism_st6
+dataconstructor http://www.gap-system.org/lib?fieldfin?IsFrobeniusAutomorphism_st7
+dataconstructor http://www.gap-system.org/lib?fieldfin?IsFrobeniusAutomorphism_st8
+dataconstructor http://www.gap-system.org/lib?fieldfin?IsFrobeniusAutomorphism_st9
+dataconstructor http://www.gap-system.org/lib?fieldfin?IsFrobeniusAutomorphism_st10
+dataconstructor http://www.gap-system.org/lib?fieldfin?IsFrobeniusAutomorphism_st11
+dataconstructor http://www.gap-system.org/lib?fieldfin?IsFrobeniusAutomorphism_st12
+dataconstructor http://www.gap-system.org/lib?fieldfin?IsFrobeniusAutomorphism_st13
+dataconstructor http://www.gap-system.org/lib?fieldfin?IsFrobeniusAutomorphism_st14
+dataconstructor http://www.gap-system.org/lib?fieldfin?IsFrobeniusAutomorphism_st15
+dataconstructor http://www.gap-system.org/lib?fieldfin?IsFrobeniusAutomorphism_st16
+dataconstructor http://www.gap-system.org/lib?fieldfin?IsFrobeniusAutomorphism_st17
+dataconstructor http://www.gap-system.org/lib?fieldfin?IsFrobeniusAutomorphism_st18
+dataconstructor http://www.gap-system.org/lib?fieldfin?IsFrobeniusAutomorphism_st19
+dataconstructor http://www.gap-system.org/lib?fieldfin?IsFrobeniusAutomorphism_st20
+dataconstructor http://www.gap-system.org/lib?fieldfin?IsFrobeniusAutomorphism_st21
+dataconstructor http://www.gap-system.org/lib?fieldfin?IsFrobeniusAutomorphism_st22
+dataconstructor http://www.gap-system.org/lib?fieldfin?IsFrobeniusAutomorphism_st23
+dataconstructor http://www.gap-system.org/lib?fieldfin?IsFrobeniusAutomorphism_st24
+dataconstructor http://www.gap-system.org/lib?fieldfin?IsBasisFiniteFieldRep
+dataconstructor http://www.gap-system.org/lib?fieldfin?IsBasisFiniteFieldRep_st0
+dataconstructor http://www.gap-system.org/lib?fieldfin?IsBasisFiniteFieldRep_st1
 theory http://www.gap-system.org/lib?fieldfin
 HasMeta http://www.gap-system.org/lib?fieldfin http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?fieldfin http://www.gap-system.org/lib?type
diff --git a/relational/http..www.gap-system.org/lib/files.rel b/relational/http..www.gap-system.org/lib/files.rel
index 8c57136ee09a3e12f1b2706c3a3f6df04970f270..fc1f9a9eacd79a47d5e9eb83a2df6827b1694610 100644
--- a/relational/http..www.gap-system.org/lib/files.rel
+++ b/relational/http..www.gap-system.org/lib/files.rel
@@ -15,6 +15,14 @@ IsAttribute http://www.gap-system.org/lib?files?ExternalFilename
 implies http://www.gap-system.org/lib?files?ExternalFilename http://www.gap-system.org/lib?files?IsDirectory
 implies http://www.gap-system.org/lib?files?ExternalFilename http://www.gap-system.org/lib?string?IsString
 implies http://www.gap-system.org/lib?files?ExternalFilename http://www.gap-system.org/lib?list?IsList
+dataconstructor http://www.gap-system.org/lib?files?ReadAsFunction
+dataconstructor http://www.gap-system.org/lib?files?Directory
+dataconstructor http://www.gap-system.org/lib?files?IsDirectoryRep
+dataconstructor http://www.gap-system.org/lib?files?IsDirectoryRep_st0
+dataconstructor http://www.gap-system.org/lib?files?IsDirectory
+dataconstructor http://www.gap-system.org/lib?files?Read
+dataconstructor http://www.gap-system.org/lib?files?Filename
+dataconstructor http://www.gap-system.org/lib?files?ExternalFilename
 theory http://www.gap-system.org/lib?files
 HasMeta http://www.gap-system.org/lib?files http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?files http://www.gap-system.org/lib?string
@@ -31,7 +39,6 @@ Declares http://www.gap-system.org/lib?files http://www.gap-system.org/lib?files
 constant http://www.gap-system.org/lib?files?IsDirectory
 Declares http://www.gap-system.org/lib?files http://www.gap-system.org/lib?files?Read
 constant http://www.gap-system.org/lib?files?Read
-Includes http://www.gap-system.org/lib?files http://www.gap-system.org/lib?files
 Includes http://www.gap-system.org/lib?files http://www.gap-system.org/lib?list
 Declares http://www.gap-system.org/lib?files http://www.gap-system.org/lib?files?Filename
 constant http://www.gap-system.org/lib?files?Filename
diff --git a/relational/http..www.gap-system.org/lib/fitfree.rel b/relational/http..www.gap-system.org/lib/fitfree.rel
index fefe1d06b21268360422a94fe4a635de9654d2f2..e65647b6346a9579bd735e540048016084e9d70c 100644
--- a/relational/http..www.gap-system.org/lib/fitfree.rel
+++ b/relational/http..www.gap-system.org/lib/fitfree.rel
@@ -40,6 +40,55 @@ IsAttribute http://www.gap-system.org/lib?fitfree?RecogDecompinfoHomomorphism
 implies http://www.gap-system.org/lib?fitfree?RecogDecompinfoHomomorphism http://www.gap-system.org/lib?mapping?IsGeneralMapping
 implies http://www.gap-system.org/lib?fitfree?RecogDecompinfoHomomorphism http://www.gap-system.org/lib?mapping?IsTotal
 implies http://www.gap-system.org/lib?fitfree?RecogDecompinfoHomomorphism http://www.gap-system.org/lib?mapping?IsSingleValued
+dataconstructor http://www.gap-system.org/lib?fitfree?ChiefSeriesTF
+dataconstructor http://www.gap-system.org/lib?fitfree?CanComputeFittingFree
+dataconstructor http://www.gap-system.org/lib?fitfree?CanComputeFittingFree_st0
+dataconstructor http://www.gap-system.org/lib?fitfree?CanComputeFittingFree_st1
+dataconstructor http://www.gap-system.org/lib?fitfree?CanComputeFittingFree_st2
+dataconstructor http://www.gap-system.org/lib?fitfree?CanComputeFittingFree_st3
+dataconstructor http://www.gap-system.org/lib?fitfree?CanComputeFittingFree_st4
+dataconstructor http://www.gap-system.org/lib?fitfree?CanComputeFittingFree_st5
+dataconstructor http://www.gap-system.org/lib?fitfree?CanComputeFittingFree_st6
+dataconstructor http://www.gap-system.org/lib?fitfree?CanComputeFittingFree_st7
+dataconstructor http://www.gap-system.org/lib?fitfree?CanComputeFittingFree_st8
+dataconstructor http://www.gap-system.org/lib?fitfree?CanComputeFittingFree_st9
+dataconstructor http://www.gap-system.org/lib?fitfree?CanComputeFittingFree_st10
+dataconstructor http://www.gap-system.org/lib?fitfree?CanComputeFittingFree_st11
+dataconstructor http://www.gap-system.org/lib?fitfree?CanComputeFittingFree_st12
+dataconstructor http://www.gap-system.org/lib?fitfree?CanComputeFittingFree_st13
+dataconstructor http://www.gap-system.org/lib?fitfree?CanComputeFittingFree_st14
+dataconstructor http://www.gap-system.org/lib?fitfree?CanComputeFittingFree_st15
+dataconstructor http://www.gap-system.org/lib?fitfree?CanComputeFittingFree_st16
+dataconstructor http://www.gap-system.org/lib?fitfree?CanComputeFittingFree_st17
+dataconstructor http://www.gap-system.org/lib?fitfree?CanComputeFittingFree_st18
+dataconstructor http://www.gap-system.org/lib?fitfree?CanComputeFittingFree_st19
+dataconstructor http://www.gap-system.org/lib?fitfree?CanComputeFittingFree_st20
+dataconstructor http://www.gap-system.org/lib?fitfree?CanComputeFittingFree_st21
+dataconstructor http://www.gap-system.org/lib?fitfree?CanComputeFittingFree_st22
+dataconstructor http://www.gap-system.org/lib?fitfree?CanComputeFittingFree_st23
+dataconstructor http://www.gap-system.org/lib?fitfree?CanComputeFittingFree_st24
+dataconstructor http://www.gap-system.org/lib?fitfree?CanComputeFittingFree_st25
+dataconstructor http://www.gap-system.org/lib?fitfree?CanComputeFittingFree_st26
+dataconstructor http://www.gap-system.org/lib?fitfree?CanComputeFittingFree_st27
+dataconstructor http://www.gap-system.org/lib?fitfree?CanComputeFittingFree_st28
+dataconstructor http://www.gap-system.org/lib?fitfree?CanComputeFittingFree_st29
+dataconstructor http://www.gap-system.org/lib?fitfree?CanComputeFittingFree_st30
+dataconstructor http://www.gap-system.org/lib?fitfree?CanComputeFittingFree_st31
+dataconstructor http://www.gap-system.org/lib?fitfree?CanComputeFittingFree_st32
+dataconstructor http://www.gap-system.org/lib?fitfree?CanComputeFittingFree_st33
+dataconstructor http://www.gap-system.org/lib?fitfree?CanComputeFittingFree_st34
+dataconstructor http://www.gap-system.org/lib?fitfree?CanComputeFittingFree_st35
+dataconstructor http://www.gap-system.org/lib?fitfree?CanComputeFittingFree_st36
+dataconstructor http://www.gap-system.org/lib?fitfree?CanComputeFittingFree_st37
+dataconstructor http://www.gap-system.org/lib?fitfree?CanComputeFittingFree_st38
+dataconstructor http://www.gap-system.org/lib?fitfree?CanComputeFittingFree_st39
+dataconstructor http://www.gap-system.org/lib?fitfree?CanComputeFittingFree_st40
+dataconstructor http://www.gap-system.org/lib?fitfree?CanComputeFittingFree_st41
+dataconstructor http://www.gap-system.org/lib?fitfree?CanComputeFittingFree_st42
+dataconstructor http://www.gap-system.org/lib?fitfree?CanComputeFittingFree_st43
+dataconstructor http://www.gap-system.org/lib?fitfree?DirectFactorsFittingFreeSocle
+dataconstructor http://www.gap-system.org/lib?fitfree?FittingFreeLiftSetup
+dataconstructor http://www.gap-system.org/lib?fitfree?RecogDecompinfoHomomorphism
 theory http://www.gap-system.org/lib?fitfree
 HasMeta http://www.gap-system.org/lib?fitfree http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?fitfree http://www.gap-system.org/lib?magma
diff --git a/relational/http..www.gap-system.org/lib/fldabnum.rel b/relational/http..www.gap-system.org/lib/fldabnum.rel
index 628f2ca3ec0d22c8687ffffa56aed26ba71819e3..676a44e76d1342d1a574c1ba376e8d9d294dbf40 100644
--- a/relational/http..www.gap-system.org/lib/fldabnum.rel
+++ b/relational/http..www.gap-system.org/lib/fldabnum.rel
@@ -155,6 +155,84 @@ implies http://www.gap-system.org/lib?fldabnum?IsRationals http://www.gap-system
 implies http://www.gap-system.org/lib?fldabnum?IsRationals http://www.gap-system.org/lib?semiring?IsRDistributive
 implies http://www.gap-system.org/lib?fldabnum?IsRationals http://www.gap-system.org/lib?ring?IsEuclideanRing
 implies http://www.gap-system.org/lib?fldabnum?IsRationals http://www.gap-system.org/lib?field?IsPrimeField
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsCanonicalBasisAbelianNumberFieldRep
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsCanonicalBasisAbelianNumberFieldRep_st0
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsCanonicalBasisAbelianNumberFieldRep_st1
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsCanonicalBasisCyclotomicFieldRep
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsCanonicalBasisCyclotomicFieldRep_st0
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsCanonicalBasisCyclotomicFieldRep_st1
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsCanonicalBasisCyclotomicFieldRep_st2
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsCyclotomicField
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsANFAutomorphismRep
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsANFAutomorphismRep_st0
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsANFAutomorphismRep_st1
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsAbelianNumberField
+dataconstructor http://www.gap-system.org/lib?fldabnum?GaloisStabilizer
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st0
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st1
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st2
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st3
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st4
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st5
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st6
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st7
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st8
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st9
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st10
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st11
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st12
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st13
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st14
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st15
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st16
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st17
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st18
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st19
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st20
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st21
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st22
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st23
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st24
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st25
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st26
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st27
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st28
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st29
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st30
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st31
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st32
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st33
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st34
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st35
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st36
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st37
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st38
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st39
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st40
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st41
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st42
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st43
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st44
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st45
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st46
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st47
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st48
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st49
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st50
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st51
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st52
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st53
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st54
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st55
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st56
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st57
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st58
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsGaussianRationals_st59
+dataconstructor http://www.gap-system.org/lib?fldabnum?ExponentOfPowering
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsANFAutomorphism
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsNumberField
+dataconstructor http://www.gap-system.org/lib?fldabnum?IsRationals
 theory http://www.gap-system.org/lib?fldabnum
 HasMeta http://www.gap-system.org/lib?fldabnum http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?fldabnum http://www.gap-system.org/lib?type
@@ -164,7 +242,6 @@ Declares http://www.gap-system.org/lib?fldabnum http://www.gap-system.org/lib?fl
 constant http://www.gap-system.org/lib?fldabnum?IsCanonicalBasisAbelianNumberFieldRep_st0
 Declares http://www.gap-system.org/lib?fldabnum http://www.gap-system.org/lib?fldabnum?IsCanonicalBasisAbelianNumberFieldRep_st1
 constant http://www.gap-system.org/lib?fldabnum?IsCanonicalBasisAbelianNumberFieldRep_st1
-Includes http://www.gap-system.org/lib?fldabnum http://www.gap-system.org/lib?fldabnum
 Declares http://www.gap-system.org/lib?fldabnum http://www.gap-system.org/lib?fldabnum?IsCanonicalBasisCyclotomicFieldRep
 constant http://www.gap-system.org/lib?fldabnum?IsCanonicalBasisCyclotomicFieldRep
 Declares http://www.gap-system.org/lib?fldabnum http://www.gap-system.org/lib?fldabnum?IsCanonicalBasisCyclotomicFieldRep_st0
diff --git a/relational/http..www.gap-system.org/lib/float.rel b/relational/http..www.gap-system.org/lib/float.rel
index c74ca740e0e2cb2a7fb05399f3eb92ea8e2f1f6f..4c003c7a9510572bae872fea86d4b2ad8a7a4ba5 100644
--- a/relational/http..www.gap-system.org/lib/float.rel
+++ b/relational/http..www.gap-system.org/lib/float.rel
@@ -245,6 +245,185 @@ IsAttribute http://www.gap-system.org/lib?float?Atanh
 implies http://www.gap-system.org/lib?float?Atanh http://www.gap-system.org/lib?float?IsFloat
 IsAttribute http://www.gap-system.org/lib?float?Hypothenuse
 implies http://www.gap-system.org/lib?float?Hypothenuse http://www.gap-system.org/lib?float?IsFloat
+dataconstructor http://www.gap-system.org/lib?float?IsFloat
+dataconstructor http://www.gap-system.org/lib?float?IsFloat_st0
+dataconstructor http://www.gap-system.org/lib?float?IsFloat_st1
+dataconstructor http://www.gap-system.org/lib?float?IsFloat_st2
+dataconstructor http://www.gap-system.org/lib?float?IsFloat_st3
+dataconstructor http://www.gap-system.org/lib?float?IsFloat_st4
+dataconstructor http://www.gap-system.org/lib?float?IsFloat_st5
+dataconstructor http://www.gap-system.org/lib?float?IsFloat_st6
+dataconstructor http://www.gap-system.org/lib?float?IsFloat_st7
+dataconstructor http://www.gap-system.org/lib?float?IsFloat_st8
+dataconstructor http://www.gap-system.org/lib?float?IsFloat_st9
+dataconstructor http://www.gap-system.org/lib?float?IsFloat_st10
+dataconstructor http://www.gap-system.org/lib?float?IsFloat_st11
+dataconstructor http://www.gap-system.org/lib?float?AbsoluteValue
+dataconstructor http://www.gap-system.org/lib?float?Coth
+dataconstructor http://www.gap-system.org/lib?float?EqFloat
+dataconstructor http://www.gap-system.org/lib?float?Sup
+dataconstructor http://www.gap-system.org/lib?float?IsPInfinity
+dataconstructor http://www.gap-system.org/lib?float?Csc
+dataconstructor http://www.gap-system.org/lib?float?Round
+dataconstructor http://www.gap-system.org/lib?float?Frac
+dataconstructor http://www.gap-system.org/lib?float?Log10
+dataconstructor http://www.gap-system.org/lib?float?IsNInfinity
+dataconstructor http://www.gap-system.org/lib?float?BisectInterval
+dataconstructor http://www.gap-system.org/lib?float?PrecisionFloat
+dataconstructor http://www.gap-system.org/lib?float?FrExp
+dataconstructor http://www.gap-system.org/lib?float?Expm1
+dataconstructor http://www.gap-system.org/lib?float?Zeta
+dataconstructor http://www.gap-system.org/lib?float?Tan
+dataconstructor http://www.gap-system.org/lib?float?Erf
+dataconstructor http://www.gap-system.org/lib?float?Sec
+dataconstructor http://www.gap-system.org/lib?float?IsFloatInterval
+dataconstructor http://www.gap-system.org/lib?float?IsFloatInterval_st0
+dataconstructor http://www.gap-system.org/lib?float?IsFloatInterval_st1
+dataconstructor http://www.gap-system.org/lib?float?IsFloatInterval_st2
+dataconstructor http://www.gap-system.org/lib?float?IsFloatInterval_st3
+dataconstructor http://www.gap-system.org/lib?float?IsFloatInterval_st4
+dataconstructor http://www.gap-system.org/lib?float?IsFloatInterval_st5
+dataconstructor http://www.gap-system.org/lib?float?IsFloatInterval_st6
+dataconstructor http://www.gap-system.org/lib?float?IsFloatInterval_st7
+dataconstructor http://www.gap-system.org/lib?float?IsFloatInterval_st8
+dataconstructor http://www.gap-system.org/lib?float?IsFloatInterval_st9
+dataconstructor http://www.gap-system.org/lib?float?IsFloatInterval_st10
+dataconstructor http://www.gap-system.org/lib?float?IsFloatInterval_st11
+dataconstructor http://www.gap-system.org/lib?float?IsFloatInterval_st12
+dataconstructor http://www.gap-system.org/lib?float?IsFloatInterval_st13
+dataconstructor http://www.gap-system.org/lib?float?IsFloatInterval_st14
+dataconstructor http://www.gap-system.org/lib?float?IsComplexFloat
+dataconstructor http://www.gap-system.org/lib?float?IsComplexFloat_st0
+dataconstructor http://www.gap-system.org/lib?float?IsComplexFloat_st1
+dataconstructor http://www.gap-system.org/lib?float?IsComplexFloat_st2
+dataconstructor http://www.gap-system.org/lib?float?IsComplexFloat_st3
+dataconstructor http://www.gap-system.org/lib?float?IsComplexFloat_st4
+dataconstructor http://www.gap-system.org/lib?float?IsComplexFloat_st5
+dataconstructor http://www.gap-system.org/lib?float?IsComplexFloat_st6
+dataconstructor http://www.gap-system.org/lib?float?IsComplexFloat_st7
+dataconstructor http://www.gap-system.org/lib?float?IsComplexFloat_st8
+dataconstructor http://www.gap-system.org/lib?float?IsComplexFloat_st9
+dataconstructor http://www.gap-system.org/lib?float?IsComplexFloat_st10
+dataconstructor http://www.gap-system.org/lib?float?IsComplexFloat_st11
+dataconstructor http://www.gap-system.org/lib?float?IsComplexFloat_st12
+dataconstructor http://www.gap-system.org/lib?float?IsComplexFloatInterval
+dataconstructor http://www.gap-system.org/lib?float?IsComplexFloatInterval_st0
+dataconstructor http://www.gap-system.org/lib?float?IsComplexFloatInterval_st1
+dataconstructor http://www.gap-system.org/lib?float?IsComplexFloatInterval_st2
+dataconstructor http://www.gap-system.org/lib?float?IsComplexFloatInterval_st3
+dataconstructor http://www.gap-system.org/lib?float?IsComplexFloatInterval_st4
+dataconstructor http://www.gap-system.org/lib?float?IsComplexFloatInterval_st5
+dataconstructor http://www.gap-system.org/lib?float?IsComplexFloatInterval_st6
+dataconstructor http://www.gap-system.org/lib?float?IsComplexFloatInterval_st7
+dataconstructor http://www.gap-system.org/lib?float?IsComplexFloatInterval_st8
+dataconstructor http://www.gap-system.org/lib?float?IsComplexFloatInterval_st9
+dataconstructor http://www.gap-system.org/lib?float?IsComplexFloatInterval_st10
+dataconstructor http://www.gap-system.org/lib?float?IsComplexFloatInterval_st11
+dataconstructor http://www.gap-system.org/lib?float?IsComplexFloatInterval_st12
+dataconstructor http://www.gap-system.org/lib?float?IsComplexFloatInterval_st13
+dataconstructor http://www.gap-system.org/lib?float?IsComplexFloatInterval_st14
+dataconstructor http://www.gap-system.org/lib?float?IsComplexFloatInterval_st15
+dataconstructor http://www.gap-system.org/lib?float?IsComplexFloatInterval_st16
+dataconstructor http://www.gap-system.org/lib?float?MakeFloat
+dataconstructor http://www.gap-system.org/lib?float?ComplexI
+dataconstructor http://www.gap-system.org/lib?float?Sinh
+dataconstructor http://www.gap-system.org/lib?float?IncreaseInterval
+dataconstructor http://www.gap-system.org/lib?float?RelativeDiameter
+dataconstructor http://www.gap-system.org/lib?float?Cosh
+dataconstructor http://www.gap-system.org/lib?float?Exp
+dataconstructor http://www.gap-system.org/lib?float?Exp2
+dataconstructor http://www.gap-system.org/lib?float?IsDisjoint
+dataconstructor http://www.gap-system.org/lib?float?IsFloatPseudoField
+dataconstructor http://www.gap-system.org/lib?float?IsFloatPseudoField_st0
+dataconstructor http://www.gap-system.org/lib?float?IsFloatPseudoField_st1
+dataconstructor http://www.gap-system.org/lib?float?IsFloatPseudoField_st2
+dataconstructor http://www.gap-system.org/lib?float?IsFloatPseudoField_st3
+dataconstructor http://www.gap-system.org/lib?float?IsFloatPseudoField_st4
+dataconstructor http://www.gap-system.org/lib?float?IsFloatPseudoField_st5
+dataconstructor http://www.gap-system.org/lib?float?IsFloatPseudoField_st6
+dataconstructor http://www.gap-system.org/lib?float?IsFloatPseudoField_st7
+dataconstructor http://www.gap-system.org/lib?float?IsFloatPseudoField_st8
+dataconstructor http://www.gap-system.org/lib?float?IsFloatPseudoField_st9
+dataconstructor http://www.gap-system.org/lib?float?IsFloatPseudoField_st10
+dataconstructor http://www.gap-system.org/lib?float?IsFloatPseudoField_st11
+dataconstructor http://www.gap-system.org/lib?float?IsFloatPseudoField_st12
+dataconstructor http://www.gap-system.org/lib?float?IsFloatPseudoField_st13
+dataconstructor http://www.gap-system.org/lib?float?IsFloatPseudoField_st14
+dataconstructor http://www.gap-system.org/lib?float?IsFloatPseudoField_st15
+dataconstructor http://www.gap-system.org/lib?float?IsFloatPseudoField_st16
+dataconstructor http://www.gap-system.org/lib?float?IsFloatPseudoField_st17
+dataconstructor http://www.gap-system.org/lib?float?IsFloatPseudoField_st18
+dataconstructor http://www.gap-system.org/lib?float?IsFloatPseudoField_st19
+dataconstructor http://www.gap-system.org/lib?float?IsFloatPseudoField_st20
+dataconstructor http://www.gap-system.org/lib?float?IsFloatPseudoField_st21
+dataconstructor http://www.gap-system.org/lib?float?IsFloatPseudoField_st22
+dataconstructor http://www.gap-system.org/lib?float?IsFloatPseudoField_st23
+dataconstructor http://www.gap-system.org/lib?float?IsFloatPseudoField_st24
+dataconstructor http://www.gap-system.org/lib?float?IsFloatPseudoField_st25
+dataconstructor http://www.gap-system.org/lib?float?IsFloatPseudoField_st26
+dataconstructor http://www.gap-system.org/lib?float?IsFloatPseudoField_st27
+dataconstructor http://www.gap-system.org/lib?float?IsFloatPseudoField_st28
+dataconstructor http://www.gap-system.org/lib?float?IsFloatPseudoField_st29
+dataconstructor http://www.gap-system.org/lib?float?IsFloatPseudoField_st30
+dataconstructor http://www.gap-system.org/lib?float?IsFloatPseudoField_st31
+dataconstructor http://www.gap-system.org/lib?float?IsFloatPseudoField_st32
+dataconstructor http://www.gap-system.org/lib?float?IsFloatPseudoField_st33
+dataconstructor http://www.gap-system.org/lib?float?IsFloatPseudoField_st34
+dataconstructor http://www.gap-system.org/lib?float?IsFloatPseudoField_st35
+dataconstructor http://www.gap-system.org/lib?float?IsNaN
+dataconstructor http://www.gap-system.org/lib?float?Atan
+dataconstructor http://www.gap-system.org/lib?float?Cot
+dataconstructor http://www.gap-system.org/lib?float?Square
+dataconstructor http://www.gap-system.org/lib?float?Cos
+dataconstructor http://www.gap-system.org/lib?float?IsFloatRationalFunction
+dataconstructor http://www.gap-system.org/lib?float?IsFloatRationalFunction_st0
+dataconstructor http://www.gap-system.org/lib?float?IsFloatRationalFunction_st1
+dataconstructor http://www.gap-system.org/lib?float?IsFloatRationalFunction_st2
+dataconstructor http://www.gap-system.org/lib?float?IsFloatRationalFunction_st3
+dataconstructor http://www.gap-system.org/lib?float?IsFloatRationalFunction_st4
+dataconstructor http://www.gap-system.org/lib?float?IsFloatRationalFunction_st5
+dataconstructor http://www.gap-system.org/lib?float?IsFloatRationalFunction_st6
+dataconstructor http://www.gap-system.org/lib?float?IsFloatRationalFunction_st7
+dataconstructor http://www.gap-system.org/lib?float?IsFloatRationalFunction_st8
+dataconstructor http://www.gap-system.org/lib?float?IsFloatRationalFunction_st9
+dataconstructor http://www.gap-system.org/lib?float?IsFloatRationalFunction_st10
+dataconstructor http://www.gap-system.org/lib?float?IsFloatRationalFunction_st11
+dataconstructor http://www.gap-system.org/lib?float?IsFloatRationalFunction_st12
+dataconstructor http://www.gap-system.org/lib?float?Log1p
+dataconstructor http://www.gap-system.org/lib?float?Argument
+dataconstructor http://www.gap-system.org/lib?float?IsFloatPolynomial
+dataconstructor http://www.gap-system.org/lib?float?Asin
+dataconstructor http://www.gap-system.org/lib?float?Cyc
+dataconstructor http://www.gap-system.org/lib?float?Ceil
+dataconstructor http://www.gap-system.org/lib?float?Overlaps
+dataconstructor http://www.gap-system.org/lib?float?SinCos
+dataconstructor http://www.gap-system.org/lib?float?Gamma
+dataconstructor http://www.gap-system.org/lib?float?Trunc
+dataconstructor http://www.gap-system.org/lib?float?Atan2
+dataconstructor http://www.gap-system.org/lib?float?CubeRoot
+dataconstructor http://www.gap-system.org/lib?float?Sin
+dataconstructor http://www.gap-system.org/lib?float?Inf
+dataconstructor http://www.gap-system.org/lib?float?SignFloat
+dataconstructor http://www.gap-system.org/lib?float?Acosh
+dataconstructor http://www.gap-system.org/lib?float?Acos
+dataconstructor http://www.gap-system.org/lib?float?Sech
+dataconstructor http://www.gap-system.org/lib?float?AbsoluteDiameter
+dataconstructor http://www.gap-system.org/lib?float?NewFloat
+dataconstructor http://www.gap-system.org/lib?float?LdExp
+dataconstructor http://www.gap-system.org/lib?float?Tanh
+dataconstructor http://www.gap-system.org/lib?float?ValueInterval
+dataconstructor http://www.gap-system.org/lib?float?RootsFloatOp
+dataconstructor http://www.gap-system.org/lib?float?Log2
+dataconstructor http://www.gap-system.org/lib?float?Floor
+dataconstructor http://www.gap-system.org/lib?float?Mid
+dataconstructor http://www.gap-system.org/lib?float?BlowupInterval
+dataconstructor http://www.gap-system.org/lib?float?Exp10
+dataconstructor http://www.gap-system.org/lib?float?IsXInfinity
+dataconstructor http://www.gap-system.org/lib?float?IsFloatUnivariatePolynomial
+dataconstructor http://www.gap-system.org/lib?float?Asinh
+dataconstructor http://www.gap-system.org/lib?float?Csch
+dataconstructor http://www.gap-system.org/lib?float?Atanh
+dataconstructor http://www.gap-system.org/lib?float?Hypothenuse
 theory http://www.gap-system.org/lib?float
 HasMeta http://www.gap-system.org/lib?float http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?float http://www.gap-system.org/lib?arith
@@ -274,7 +453,6 @@ Declares http://www.gap-system.org/lib?float http://www.gap-system.org/lib?float
 constant http://www.gap-system.org/lib?float?IsFloat_st10
 Declares http://www.gap-system.org/lib?float http://www.gap-system.org/lib?float?IsFloat_st11
 constant http://www.gap-system.org/lib?float?IsFloat_st11
-Includes http://www.gap-system.org/lib?float http://www.gap-system.org/lib?float
 Includes http://www.gap-system.org/lib?float http://www.gap-system.org/lib?cyclotom
 Declares http://www.gap-system.org/lib?float http://www.gap-system.org/lib?float?AbsoluteValue
 constant http://www.gap-system.org/lib?float?AbsoluteValue
diff --git a/relational/http..www.gap-system.org/lib/fpmon.rel b/relational/http..www.gap-system.org/lib/fpmon.rel
index 01c18f66b84890cd0b5defc655f6f78efa973ab8..329c92345f5abda38c053b4f195d1dad7316fc67 100644
--- a/relational/http..www.gap-system.org/lib/fpmon.rel
+++ b/relational/http..www.gap-system.org/lib/fpmon.rel
@@ -38,6 +38,20 @@ implies http://www.gap-system.org/lib?fpmon?IsFpMonoid http://www.gap-system.org
 implies http://www.gap-system.org/lib?fpmon?IsFpMonoid http://www.gap-system.org/lib?magma?IsMagmaWithOne
 implies http://www.gap-system.org/lib?fpmon?IsFpMonoid http://www.gap-system.org/lib?magma?IsAssociative
 implies http://www.gap-system.org/lib?fpmon?IsFpMonoid http://www.gap-system.org/lib?fpmon?IsElementOfFpMonoid
+dataconstructor http://www.gap-system.org/lib?fpmon?IsElementOfFpMonoid
+dataconstructor http://www.gap-system.org/lib?fpmon?IsElementOfFpMonoid_st0
+dataconstructor http://www.gap-system.org/lib?fpmon?IsElementOfFpMonoid_st1
+dataconstructor http://www.gap-system.org/lib?fpmon?IsElementOfFpMonoid_st2
+dataconstructor http://www.gap-system.org/lib?fpmon?IsElementOfFpMonoid_st3
+dataconstructor http://www.gap-system.org/lib?fpmon?IsElementOfFpMonoid_st4
+dataconstructor http://www.gap-system.org/lib?fpmon?FreeGeneratorsOfFpMonoid
+dataconstructor http://www.gap-system.org/lib?fpmon?FpMonoidOfElementOfFpMonoid
+dataconstructor http://www.gap-system.org/lib?fpmon?IsSubmonoidFpMonoid
+dataconstructor http://www.gap-system.org/lib?fpmon?FreeMonoidOfFpMonoid
+dataconstructor http://www.gap-system.org/lib?fpmon?IsomorphismFpMonoid
+dataconstructor http://www.gap-system.org/lib?fpmon?ElementOfFpMonoid
+dataconstructor http://www.gap-system.org/lib?fpmon?RelationsOfFpMonoid
+dataconstructor http://www.gap-system.org/lib?fpmon?IsFpMonoid
 theory http://www.gap-system.org/lib?fpmon
 HasMeta http://www.gap-system.org/lib?fpmon http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?fpmon http://www.gap-system.org/lib?arith
@@ -55,7 +69,6 @@ Declares http://www.gap-system.org/lib?fpmon http://www.gap-system.org/lib?fpmon
 constant http://www.gap-system.org/lib?fpmon?IsElementOfFpMonoid_st4
 Includes http://www.gap-system.org/lib?fpmon http://www.gap-system.org/lib?coll
 Includes http://www.gap-system.org/lib?fpmon http://www.gap-system.org/lib?magma
-Includes http://www.gap-system.org/lib?fpmon http://www.gap-system.org/lib?fpmon
 Declares http://www.gap-system.org/lib?fpmon http://www.gap-system.org/lib?fpmon?FreeGeneratorsOfFpMonoid
 constant http://www.gap-system.org/lib?fpmon?FreeGeneratorsOfFpMonoid
 Declares http://www.gap-system.org/lib?fpmon http://www.gap-system.org/lib?fpmon?FpMonoidOfElementOfFpMonoid
diff --git a/relational/http..www.gap-system.org/lib/fpsemi.rel b/relational/http..www.gap-system.org/lib/fpsemi.rel
index a065a7951a88a0caa380eccd033eae83fc670904..c9bf11eb5b0ae30666f55669f69080ab2deac7c5 100644
--- a/relational/http..www.gap-system.org/lib/fpsemi.rel
+++ b/relational/http..www.gap-system.org/lib/fpsemi.rel
@@ -38,6 +38,20 @@ IsFilter http://www.gap-system.org/lib?fpsemi?IsSubsemigroupFpSemigroup
 implies http://www.gap-system.org/lib?fpsemi?IsSubsemigroupFpSemigroup http://www.gap-system.org/lib?magma?IsMagma
 implies http://www.gap-system.org/lib?fpsemi?IsSubsemigroupFpSemigroup http://www.gap-system.org/lib?magma?IsAssociative
 implies http://www.gap-system.org/lib?fpsemi?IsSubsemigroupFpSemigroup http://www.gap-system.org/lib?fpsemi?IsElementOfFpSemigroup
+dataconstructor http://www.gap-system.org/lib?fpsemi?IsElementOfFpSemigroup
+dataconstructor http://www.gap-system.org/lib?fpsemi?IsElementOfFpSemigroup_st0
+dataconstructor http://www.gap-system.org/lib?fpsemi?IsElementOfFpSemigroup_st1
+dataconstructor http://www.gap-system.org/lib?fpsemi?IsElementOfFpSemigroup_st2
+dataconstructor http://www.gap-system.org/lib?fpsemi?IsElementOfFpSemigroup_st3
+dataconstructor http://www.gap-system.org/lib?fpsemi?ElementOfFpSemigroup
+dataconstructor http://www.gap-system.org/lib?fpsemi?RelationsOfFpSemigroup
+dataconstructor http://www.gap-system.org/lib?fpsemi?IsomorphismFpSemigroup
+dataconstructor http://www.gap-system.org/lib?fpsemi?FreeSemigroupOfFpSemigroup
+dataconstructor http://www.gap-system.org/lib?fpsemi?FpSemigroupOfElementOfFpSemigroup
+dataconstructor http://www.gap-system.org/lib?fpsemi?FpGrpMonSmgOfFpGrpMonSmgElement
+dataconstructor http://www.gap-system.org/lib?fpsemi?IsFpSemigroup
+dataconstructor http://www.gap-system.org/lib?fpsemi?FreeGeneratorsOfFpSemigroup
+dataconstructor http://www.gap-system.org/lib?fpsemi?IsSubsemigroupFpSemigroup
 theory http://www.gap-system.org/lib?fpsemi
 HasMeta http://www.gap-system.org/lib?fpsemi http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?fpsemi http://www.gap-system.org/lib?arith
@@ -51,7 +65,6 @@ Declares http://www.gap-system.org/lib?fpsemi http://www.gap-system.org/lib?fpse
 constant http://www.gap-system.org/lib?fpsemi?IsElementOfFpSemigroup_st2
 Declares http://www.gap-system.org/lib?fpsemi http://www.gap-system.org/lib?fpsemi?IsElementOfFpSemigroup_st3
 constant http://www.gap-system.org/lib?fpsemi?IsElementOfFpSemigroup_st3
-Includes http://www.gap-system.org/lib?fpsemi http://www.gap-system.org/lib?fpsemi
 Includes http://www.gap-system.org/lib?fpsemi http://www.gap-system.org/lib?word
 Declares http://www.gap-system.org/lib?fpsemi http://www.gap-system.org/lib?fpsemi?ElementOfFpSemigroup
 constant http://www.gap-system.org/lib?fpsemi?ElementOfFpSemigroup
diff --git a/relational/http..www.gap-system.org/lib/function.rel b/relational/http..www.gap-system.org/lib/function.rel
index d7a414862bee22b88e55c267d8e899446fb2512f..d65720842f77366eafd8e651c960f0974ddb5161 100644
--- a/relational/http..www.gap-system.org/lib/function.rel
+++ b/relational/http..www.gap-system.org/lib/function.rel
@@ -5,13 +5,18 @@ implies http://www.gap-system.org/lib?function?IsOperation_st0 http://www.gap-sy
 IsAttribute http://www.gap-system.org/lib?function?CallFuncList
 implies http://www.gap-system.org/lib?function?CallFuncList http://www.gap-system.org/lib?list?IsList
 IsAttribute http://www.gap-system.org/lib?function?NumberArgumentsFunction
+dataconstructor http://www.gap-system.org/lib?function?IsFunction
+dataconstructor http://www.gap-system.org/lib?function?NameFunction
+dataconstructor http://www.gap-system.org/lib?function?IsOperation
+dataconstructor http://www.gap-system.org/lib?function?IsOperation_st0
+dataconstructor http://www.gap-system.org/lib?function?CallFuncList
+dataconstructor http://www.gap-system.org/lib?function?NumberArgumentsFunction
 theory http://www.gap-system.org/lib?function
 HasMeta http://www.gap-system.org/lib?function http://www.gap-system.org/?Types
 Declares http://www.gap-system.org/lib?function http://www.gap-system.org/lib?function?IsFunction
 constant http://www.gap-system.org/lib?function?IsFunction
 Declares http://www.gap-system.org/lib?function http://www.gap-system.org/lib?function?NameFunction
 constant http://www.gap-system.org/lib?function?NameFunction
-Includes http://www.gap-system.org/lib?function http://www.gap-system.org/lib?function
 Declares http://www.gap-system.org/lib?function http://www.gap-system.org/lib?function?IsOperation
 constant http://www.gap-system.org/lib?function?IsOperation
 Declares http://www.gap-system.org/lib?function http://www.gap-system.org/lib?function?IsOperation_st0
diff --git a/relational/http..www.gap-system.org/lib/galois.rel b/relational/http..www.gap-system.org/lib/galois.rel
index 80f69af5b1ae32acdfc7898aedc8a088c81725a0..f247c93878922224af1b377b1a352833612002bc 100644
--- a/relational/http..www.gap-system.org/lib/galois.rel
+++ b/relational/http..www.gap-system.org/lib/galois.rel
@@ -1,5 +1,6 @@
 IsAttribute http://www.gap-system.org/lib?galois?GaloisType
 implies http://www.gap-system.org/lib?galois?GaloisType http://www.gap-system.org/lib?ratfun?IsRationalFunction
+dataconstructor http://www.gap-system.org/lib?galois?GaloisType
 theory http://www.gap-system.org/lib?galois
 HasMeta http://www.gap-system.org/lib?galois http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?galois http://www.gap-system.org/lib?ratfun
diff --git a/relational/http..www.gap-system.org/lib/gaussian.rel b/relational/http..www.gap-system.org/lib/gaussian.rel
index 3e402fd38e8d3981393ec992d09c6103f97c66cf..7caa202b58dc5700a62697ded15b5e279589b83a 100644
--- a/relational/http..www.gap-system.org/lib/gaussian.rel
+++ b/relational/http..www.gap-system.org/lib/gaussian.rel
@@ -1,6 +1,9 @@
 IsFilter http://www.gap-system.org/lib?gaussian?IsCanonicalBasisGaussianIntegersRep
 implies http://www.gap-system.org/lib?gaussian?IsCanonicalBasisGaussianIntegersRep_st1 http://www.gap-system.org/lib?type?IsComponentObjectRep
 implies http://www.gap-system.org/lib?gaussian?IsCanonicalBasisGaussianIntegersRep_st1 http://www.gap-system.org/lib?type?IsAttributeStoringRep
+dataconstructor http://www.gap-system.org/lib?gaussian?IsCanonicalBasisGaussianIntegersRep
+dataconstructor http://www.gap-system.org/lib?gaussian?IsCanonicalBasisGaussianIntegersRep_st0
+dataconstructor http://www.gap-system.org/lib?gaussian?IsCanonicalBasisGaussianIntegersRep_st1
 theory http://www.gap-system.org/lib?gaussian
 HasMeta http://www.gap-system.org/lib?gaussian http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?gaussian http://www.gap-system.org/lib?type
diff --git a/relational/http..www.gap-system.org/lib/ghom.rel b/relational/http..www.gap-system.org/lib/ghom.rel
index ca075f03da7ac0ea816bfd1b70fcbe379359c6ca..0c7e9b38199b2cc9dc830a185842478fcf7e66bb 100644
--- a/relational/http..www.gap-system.org/lib/ghom.rel
+++ b/relational/http..www.gap-system.org/lib/ghom.rel
@@ -102,6 +102,75 @@ IsAttribute http://www.gap-system.org/lib?ghom?IsInnerAutomorphism
 implies http://www.gap-system.org/lib?ghom?IsInnerAutomorphism http://www.gap-system.org/lib?mapping?IsGeneralMapping
 implies http://www.gap-system.org/lib?ghom?IsInnerAutomorphism http://www.gap-system.org/lib?mapphomo?RespectsMultiplication
 implies http://www.gap-system.org/lib?ghom?IsInnerAutomorphism http://www.gap-system.org/lib?mapphomo?RespectsInverses
+dataconstructor http://www.gap-system.org/lib?ghom?IsGroupGeneralMappingByImages
+dataconstructor http://www.gap-system.org/lib?ghom?IsGroupGeneralMappingByImages_st0
+dataconstructor http://www.gap-system.org/lib?ghom?IsGroupGeneralMappingByImages_st1
+dataconstructor http://www.gap-system.org/lib?ghom?IsGroupGeneralMappingByImages_st2
+dataconstructor http://www.gap-system.org/lib?ghom?IsGroupGeneralMappingByImages_st3
+dataconstructor http://www.gap-system.org/lib?ghom?IsGroupGeneralMappingByImages_st4
+dataconstructor http://www.gap-system.org/lib?ghom?IsGroupGeneralMappingByImages_st5
+dataconstructor http://www.gap-system.org/lib?ghom?IsGroupGeneralMappingByImages_st6
+dataconstructor http://www.gap-system.org/lib?ghom?IsGroupGeneralMappingByImages_st7
+dataconstructor http://www.gap-system.org/lib?ghom?IsGroupGeneralMappingByImages_st8
+dataconstructor http://www.gap-system.org/lib?ghom?IsGroupGeneralMappingByImages_st9
+dataconstructor http://www.gap-system.org/lib?ghom?IsGroupGeneralMappingByImages_st10
+dataconstructor http://www.gap-system.org/lib?ghom?IsGroupGeneralMappingByImages_st11
+dataconstructor http://www.gap-system.org/lib?ghom?IsGroupGeneralMappingByImages_st12
+dataconstructor http://www.gap-system.org/lib?ghom?IsGroupGeneralMappingByImages_st13
+dataconstructor http://www.gap-system.org/lib?ghom?IsGroupGeneralMappingByImages_st14
+dataconstructor http://www.gap-system.org/lib?ghom?IsGroupGeneralMappingByImages_st15
+dataconstructor http://www.gap-system.org/lib?ghom?IsConjugatorIsomorphism
+dataconstructor http://www.gap-system.org/lib?ghom?IsConjugatorAutomorphism
+dataconstructor http://www.gap-system.org/lib?ghom?IsPreimagesByAsGroupGeneralMappingByImages
+dataconstructor http://www.gap-system.org/lib?ghom?IsPreimagesByAsGroupGeneralMappingByImages_st0
+dataconstructor http://www.gap-system.org/lib?ghom?IsPreimagesByAsGroupGeneralMappingByImages_st1
+dataconstructor http://www.gap-system.org/lib?ghom?IsPreimagesByAsGroupGeneralMappingByImages_st2
+dataconstructor http://www.gap-system.org/lib?ghom?IsPreimagesByAsGroupGeneralMappingByImages_st3
+dataconstructor http://www.gap-system.org/lib?ghom?IsPreimagesByAsGroupGeneralMappingByImages_st4
+dataconstructor http://www.gap-system.org/lib?ghom?IsPreimagesByAsGroupGeneralMappingByImages_st5
+dataconstructor http://www.gap-system.org/lib?ghom?IsPreimagesByAsGroupGeneralMappingByImages_st6
+dataconstructor http://www.gap-system.org/lib?ghom?IsPreimagesByAsGroupGeneralMappingByImages_st7
+dataconstructor http://www.gap-system.org/lib?ghom?IsPreimagesByAsGroupGeneralMappingByImages_st8
+dataconstructor http://www.gap-system.org/lib?ghom?IsPreimagesByAsGroupGeneralMappingByImages_st9
+dataconstructor http://www.gap-system.org/lib?ghom?IsPreimagesByAsGroupGeneralMappingByImages_st10
+dataconstructor http://www.gap-system.org/lib?ghom?IsPreimagesByAsGroupGeneralMappingByImages_st11
+dataconstructor http://www.gap-system.org/lib?ghom?IsPreimagesByAsGroupGeneralMappingByImages_st12
+dataconstructor http://www.gap-system.org/lib?ghom?IsPreimagesByAsGroupGeneralMappingByImages_st13
+dataconstructor http://www.gap-system.org/lib?ghom?IsPreimagesByAsGroupGeneralMappingByImages_st14
+dataconstructor http://www.gap-system.org/lib?ghom?IsPreimagesByAsGroupGeneralMappingByImages_st15
+dataconstructor http://www.gap-system.org/lib?ghom?NaturalHomomorphismByNormalSubgroupNCOp
+dataconstructor http://www.gap-system.org/lib?ghom?ConjugatorAutomorphismNC
+dataconstructor http://www.gap-system.org/lib?ghom?ConjugatorOfConjugatorIsomorphism
+dataconstructor http://www.gap-system.org/lib?ghom?GroupGeneralMappingByImages
+dataconstructor http://www.gap-system.org/lib?ghom?InnerAutomorphismNC
+dataconstructor http://www.gap-system.org/lib?ghom?ImagesSmallestGenerators
+dataconstructor http://www.gap-system.org/lib?ghom?ConjugatorIsomorphism
+dataconstructor http://www.gap-system.org/lib?ghom?RegularActionHomomorphism
+dataconstructor http://www.gap-system.org/lib?ghom?NaturalHomomorphismByNormalSubgroupNC
+dataconstructor http://www.gap-system.org/lib?ghom?MappingOfWhichItIsAsGGMBI
+dataconstructor http://www.gap-system.org/lib?ghom?AsGroupGeneralMappingByImages
+dataconstructor http://www.gap-system.org/lib?ghom?NaturalHomomorphismByNormalSubgroupNCInParent
+dataconstructor http://www.gap-system.org/lib?ghom?GroupGeneralMappingByImagesNC
+dataconstructor http://www.gap-system.org/lib?ghom?IsGroupGeneralMappingByAsGroupGeneralMappingByImages
+dataconstructor http://www.gap-system.org/lib?ghom?IsGroupGeneralMappingByAsGroupGeneralMappingByImages_st0
+dataconstructor http://www.gap-system.org/lib?ghom?IsGroupGeneralMappingByAsGroupGeneralMappingByImages_st1
+dataconstructor http://www.gap-system.org/lib?ghom?IsGroupGeneralMappingByAsGroupGeneralMappingByImages_st2
+dataconstructor http://www.gap-system.org/lib?ghom?IsGroupGeneralMappingByAsGroupGeneralMappingByImages_st3
+dataconstructor http://www.gap-system.org/lib?ghom?IsGroupGeneralMappingByAsGroupGeneralMappingByImages_st4
+dataconstructor http://www.gap-system.org/lib?ghom?IsGroupGeneralMappingByAsGroupGeneralMappingByImages_st5
+dataconstructor http://www.gap-system.org/lib?ghom?IsGroupGeneralMappingByAsGroupGeneralMappingByImages_st6
+dataconstructor http://www.gap-system.org/lib?ghom?IsGroupGeneralMappingByAsGroupGeneralMappingByImages_st7
+dataconstructor http://www.gap-system.org/lib?ghom?IsGroupGeneralMappingByAsGroupGeneralMappingByImages_st8
+dataconstructor http://www.gap-system.org/lib?ghom?IsGroupGeneralMappingByAsGroupGeneralMappingByImages_st9
+dataconstructor http://www.gap-system.org/lib?ghom?IsGroupGeneralMappingByAsGroupGeneralMappingByImages_st10
+dataconstructor http://www.gap-system.org/lib?ghom?IsGroupGeneralMappingByAsGroupGeneralMappingByImages_st11
+dataconstructor http://www.gap-system.org/lib?ghom?IsGroupGeneralMappingByAsGroupGeneralMappingByImages_st12
+dataconstructor http://www.gap-system.org/lib?ghom?IsGroupGeneralMappingByAsGroupGeneralMappingByImages_st13
+dataconstructor http://www.gap-system.org/lib?ghom?IsGroupGeneralMappingByAsGroupGeneralMappingByImages_st14
+dataconstructor http://www.gap-system.org/lib?ghom?IsGroupGeneralMappingByAsGroupGeneralMappingByImages_st15
+dataconstructor http://www.gap-system.org/lib?ghom?IsGroupGeneralMappingByAsGroupGeneralMappingByImages_st16
+dataconstructor http://www.gap-system.org/lib?ghom?GroupHomomorphismByImagesNC
+dataconstructor http://www.gap-system.org/lib?ghom?IsInnerAutomorphism
 theory http://www.gap-system.org/lib?ghom
 HasMeta http://www.gap-system.org/lib?ghom http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?ghom http://www.gap-system.org/lib?type
@@ -144,7 +213,6 @@ Declares http://www.gap-system.org/lib?ghom http://www.gap-system.org/lib?ghom?I
 constant http://www.gap-system.org/lib?ghom?IsGroupGeneralMappingByImages_st15
 Declares http://www.gap-system.org/lib?ghom http://www.gap-system.org/lib?ghom?IsConjugatorIsomorphism
 constant http://www.gap-system.org/lib?ghom?IsConjugatorIsomorphism
-Includes http://www.gap-system.org/lib?ghom http://www.gap-system.org/lib?ghom
 Declares http://www.gap-system.org/lib?ghom http://www.gap-system.org/lib?ghom?IsConjugatorAutomorphism
 constant http://www.gap-system.org/lib?ghom?IsConjugatorAutomorphism
 Declares http://www.gap-system.org/lib?ghom http://www.gap-system.org/lib?ghom?IsPreimagesByAsGroupGeneralMappingByImages
diff --git a/relational/http..www.gap-system.org/lib/ghomfp.rel b/relational/http..www.gap-system.org/lib/ghomfp.rel
index 37f1813e17a0614140c929a80db382cb1621869d..04803f24ede23f5dd40789d50905286c18a6c5d6 100644
--- a/relational/http..www.gap-system.org/lib/ghomfp.rel
+++ b/relational/http..www.gap-system.org/lib/ghomfp.rel
@@ -110,6 +110,113 @@ implies http://www.gap-system.org/lib?ghomfp?IsToFpGroupHomomorphismByImages htt
 implies http://www.gap-system.org/lib?ghomfp?IsToFpGroupHomomorphismByImages http://www.gap-system.org/lib?mapping?IsTotal
 implies http://www.gap-system.org/lib?ghomfp?IsToFpGroupHomomorphismByImages http://www.gap-system.org/lib?mapping?IsSingleValued
 implies http://www.gap-system.org/lib?ghomfp?IsToFpGroupHomomorphismByImages http://www.gap-system.org/lib?ghomfp?IsToFpGroupGeneralMappingByImages
+dataconstructor http://www.gap-system.org/lib?ghomfp?Extrarankfilter
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupGeneralMapping
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupGeneralMapping_st0
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupGeneralMapping_st1
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupGeneralMapping_st2
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupGeneralMapping_st3
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupGeneralMapping_st4
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupGeneralMapping_st5
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupGeneralMapping_st6
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupGeneralMapping_st7
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupGeneralMapping_st8
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupGeneralMapping_st9
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupGeneralMapping_st10
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupGeneralMapping_st11
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupGeneralMapping_st12
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupGeneralMapping_st13
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupGeneralMappingByImages
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupGeneralMappingByImages_st0
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupGeneralMappingByImages_st1
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupGeneralMappingByImages_st2
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupGeneralMappingByImages_st3
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupGeneralMappingByImages_st4
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupGeneralMappingByImages_st5
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupGeneralMappingByImages_st6
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupGeneralMappingByImages_st7
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupGeneralMappingByImages_st8
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupGeneralMappingByImages_st9
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupGeneralMappingByImages_st10
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupGeneralMappingByImages_st11
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupGeneralMappingByImages_st12
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupGeneralMappingByImages_st13
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupGeneralMappingByImages_st14
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupGeneralMappingByImages_st15
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupGeneralMappingByImages_st16
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupGeneralMappingByImages_st17
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupGeneralMappingByImages_st18
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupStdGensGeneralMappingByImages
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupStdGensGeneralMappingByImages_st0
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupStdGensGeneralMappingByImages_st1
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupStdGensGeneralMappingByImages_st2
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupStdGensGeneralMappingByImages_st3
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupStdGensGeneralMappingByImages_st4
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupStdGensGeneralMappingByImages_st5
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupStdGensGeneralMappingByImages_st6
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupStdGensGeneralMappingByImages_st7
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupStdGensGeneralMappingByImages_st8
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupStdGensGeneralMappingByImages_st9
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupStdGensGeneralMappingByImages_st10
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupStdGensGeneralMappingByImages_st11
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupStdGensGeneralMappingByImages_st12
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupStdGensGeneralMappingByImages_st13
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupStdGensGeneralMappingByImages_st14
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupStdGensGeneralMappingByImages_st15
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupStdGensGeneralMappingByImages_st16
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupStdGensGeneralMappingByImages_st17
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupStdGensGeneralMappingByImages_st18
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupStdGensGeneralMappingByImages_st19
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupStdGensHomomorphismByImages
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsToFpGroupGeneralMappingByImages
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsToFpGroupGeneralMappingByImages_st0
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsToFpGroupGeneralMappingByImages_st1
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsToFpGroupGeneralMappingByImages_st2
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsToFpGroupGeneralMappingByImages_st3
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsToFpGroupGeneralMappingByImages_st4
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsToFpGroupGeneralMappingByImages_st5
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsToFpGroupGeneralMappingByImages_st6
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsToFpGroupGeneralMappingByImages_st7
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsToFpGroupGeneralMappingByImages_st8
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsToFpGroupGeneralMappingByImages_st9
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsToFpGroupGeneralMappingByImages_st10
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsToFpGroupGeneralMappingByImages_st11
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsToFpGroupGeneralMappingByImages_st12
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsToFpGroupGeneralMappingByImages_st13
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsToFpGroupGeneralMappingByImages_st14
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsToFpGroupGeneralMappingByImages_st15
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsToFpGroupGeneralMappingByImages_st16
+dataconstructor http://www.gap-system.org/lib?ghomfp?EpimorphismFromFreeGroup
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupHomomorphismByImages
+dataconstructor http://www.gap-system.org/lib?ghomfp?CosetTableFpHom
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsWordDecompHomomorphism
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsFromFpGroupHomomorphism
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsomorphismSimplifiedFpGroup
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsModuloPcgsFpGroupRep
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsModuloPcgsFpGroupRep_st0
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsModuloPcgsFpGroupRep_st1
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsModuloPcgsFpGroupRep_st2
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsModuloPcgsFpGroupRep_st3
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsModuloPcgsFpGroupRep_st4
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsModuloPcgsFpGroupRep_st5
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsModuloPcgsFpGroupRep_st6
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsModuloPcgsFpGroupRep_st7
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsModuloPcgsFpGroupRep_st8
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsModuloPcgsFpGroupRep_st9
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsModuloPcgsFpGroupRep_st10
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsModuloPcgsFpGroupRep_st11
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsModuloPcgsFpGroupRep_st12
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsModuloPcgsFpGroupRep_st13
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsModuloPcgsFpGroupRep_st14
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsModuloPcgsFpGroupRep_st15
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsModuloPcgsFpGroupRep_st16
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsModuloPcgsFpGroupRep_st17
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsModuloPcgsFpGroupRep_st18
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsModuloPcgsFpGroupRep_st19
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsModuloPcgsFpGroupRep_st20
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsModuloPcgsFpGroupRep_st21
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsModuloPcgsFpGroupRep_st22
+dataconstructor http://www.gap-system.org/lib?ghomfp?IsToFpGroupHomomorphismByImages
 theory http://www.gap-system.org/lib?ghomfp
 HasMeta http://www.gap-system.org/lib?ghomfp http://www.gap-system.org/?Types
 Declares http://www.gap-system.org/lib?ghomfp http://www.gap-system.org/lib?ghomfp?Extrarankfilter
@@ -117,7 +224,6 @@ constant http://www.gap-system.org/lib?ghomfp?Extrarankfilter
 Includes http://www.gap-system.org/lib?ghomfp http://www.gap-system.org/lib?arith
 Includes http://www.gap-system.org/lib?ghomfp http://www.gap-system.org/lib?mapping
 Includes http://www.gap-system.org/lib?ghomfp http://www.gap-system.org/lib?mapphomo
-Includes http://www.gap-system.org/lib?ghomfp http://www.gap-system.org/lib?ghomfp
 Declares http://www.gap-system.org/lib?ghomfp http://www.gap-system.org/lib?ghomfp?IsFromFpGroupGeneralMapping
 constant http://www.gap-system.org/lib?ghomfp?IsFromFpGroupGeneralMapping
 Declares http://www.gap-system.org/lib?ghomfp http://www.gap-system.org/lib?ghomfp?IsFromFpGroupGeneralMapping_st0
diff --git a/relational/http..www.gap-system.org/lib/ghompcgs.rel b/relational/http..www.gap-system.org/lib/ghompcgs.rel
index 41061620197ded9b82b2e6b5cc1d4dd1845753ba..a08828789ee341cc2ae8166ceb90bb430c1b2fc1 100644
--- a/relational/http..www.gap-system.org/lib/ghompcgs.rel
+++ b/relational/http..www.gap-system.org/lib/ghompcgs.rel
@@ -98,6 +98,109 @@ IsAttribute http://www.gap-system.org/lib?ghompcgs?NaturalIsomorphismByPcgs
 implies http://www.gap-system.org/lib?ghompcgs?NaturalIsomorphismByPcgs http://www.gap-system.org/lib?magma?IsMagmaWithInverses
 implies http://www.gap-system.org/lib?ghompcgs?NaturalIsomorphismByPcgs http://www.gap-system.org/lib?magma?IsAssociative
 implies http://www.gap-system.org/lib?ghompcgs?NaturalIsomorphismByPcgs http://www.gap-system.org/lib?pcgs?IsPcgs
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsToPcGroupGeneralMappingByImages
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsToPcGroupGeneralMappingByImages_st0
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsToPcGroupGeneralMappingByImages_st1
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsToPcGroupGeneralMappingByImages_st2
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsToPcGroupGeneralMappingByImages_st3
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsToPcGroupGeneralMappingByImages_st4
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsToPcGroupGeneralMappingByImages_st5
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsToPcGroupGeneralMappingByImages_st6
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsToPcGroupGeneralMappingByImages_st7
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsToPcGroupGeneralMappingByImages_st8
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsToPcGroupGeneralMappingByImages_st9
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsToPcGroupGeneralMappingByImages_st10
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsToPcGroupGeneralMappingByImages_st11
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsToPcGroupGeneralMappingByImages_st12
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsToPcGroupGeneralMappingByImages_st13
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsToPcGroupGeneralMappingByImages_st14
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsToPcGroupGeneralMappingByImages_st15
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsToPcGroupGeneralMappingByImages_st16
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsToPcGroupHomomorphismByImages
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsGroupGeneralMappingByPcgs
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsGroupGeneralMappingByPcgs_st0
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsGroupGeneralMappingByPcgs_st1
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsGroupGeneralMappingByPcgs_st2
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsGroupGeneralMappingByPcgs_st3
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsGroupGeneralMappingByPcgs_st4
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsGroupGeneralMappingByPcgs_st5
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsGroupGeneralMappingByPcgs_st6
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsGroupGeneralMappingByPcgs_st7
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsGroupGeneralMappingByPcgs_st8
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsGroupGeneralMappingByPcgs_st9
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsGroupGeneralMappingByPcgs_st10
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsGroupGeneralMappingByPcgs_st11
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsGroupGeneralMappingByPcgs_st12
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsGroupGeneralMappingByPcgs_st13
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsGroupGeneralMappingByPcgs_st14
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsGroupGeneralMappingByPcgs_st15
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsGroupGeneralMappingByPcgs_st16
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsPcGroupGeneralMappingByImages
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsPcGroupGeneralMappingByImages_st0
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsPcGroupGeneralMappingByImages_st1
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsPcGroupGeneralMappingByImages_st2
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsPcGroupGeneralMappingByImages_st3
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsPcGroupGeneralMappingByImages_st4
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsPcGroupGeneralMappingByImages_st5
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsPcGroupGeneralMappingByImages_st6
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsPcGroupGeneralMappingByImages_st7
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsPcGroupGeneralMappingByImages_st8
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsPcGroupGeneralMappingByImages_st9
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsPcGroupGeneralMappingByImages_st10
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsPcGroupGeneralMappingByImages_st11
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsPcGroupGeneralMappingByImages_st12
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsPcGroupGeneralMappingByImages_st13
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsPcGroupGeneralMappingByImages_st14
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsPcGroupGeneralMappingByImages_st15
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsPcGroupGeneralMappingByImages_st16
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsPcGroupGeneralMappingByImages_st17
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsPcgsToPcgsGeneralMappingByImages
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsPcgsToPcgsGeneralMappingByImages_st0
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsPcgsToPcgsGeneralMappingByImages_st1
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsPcgsToPcgsGeneralMappingByImages_st2
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsPcgsToPcgsGeneralMappingByImages_st3
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsPcgsToPcgsGeneralMappingByImages_st4
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsPcgsToPcgsGeneralMappingByImages_st5
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsPcgsToPcgsGeneralMappingByImages_st6
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsPcgsToPcgsGeneralMappingByImages_st7
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsPcgsToPcgsGeneralMappingByImages_st8
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsPcgsToPcgsGeneralMappingByImages_st9
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsPcgsToPcgsGeneralMappingByImages_st10
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsPcgsToPcgsGeneralMappingByImages_st11
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsPcgsToPcgsGeneralMappingByImages_st12
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsPcgsToPcgsGeneralMappingByImages_st13
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsPcgsToPcgsGeneralMappingByImages_st14
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsPcgsToPcgsGeneralMappingByImages_st15
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsPcgsToPcgsGeneralMappingByImages_st16
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsPcgsToPcgsGeneralMappingByImages_st17
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsPcgsToPcgsGeneralMappingByImages_st18
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsPcgsToPcgsGeneralMappingByImages_st19
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsNaturalHomomorphismPcGroupRep
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsNaturalHomomorphismPcGroupRep_st0
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsNaturalHomomorphismPcGroupRep_st1
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsNaturalHomomorphismPcGroupRep_st2
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsNaturalHomomorphismPcGroupRep_st3
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsNaturalHomomorphismPcGroupRep_st4
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsNaturalHomomorphismPcGroupRep_st5
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsNaturalHomomorphismPcGroupRep_st6
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsNaturalHomomorphismPcGroupRep_st7
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsNaturalHomomorphismPcGroupRep_st8
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsNaturalHomomorphismPcGroupRep_st9
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsNaturalHomomorphismPcGroupRep_st10
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsNaturalHomomorphismPcGroupRep_st11
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsNaturalHomomorphismPcGroupRep_st12
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsNaturalHomomorphismPcGroupRep_st13
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsNaturalHomomorphismPcGroupRep_st14
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsNaturalHomomorphismPcGroupRep_st15
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsNaturalHomomorphismPcGroupRep_st16
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsNaturalHomomorphismPcGroupRep_st17
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsNaturalHomomorphismPcGroupRep_st18
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsNaturalHomomorphismPcGroupRep_st19
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsNaturalHomomorphismPcGroupRep_st20
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsNaturalHomomorphismPcGroupRep_st21
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsPcgsToPcgsHomomorphism
+dataconstructor http://www.gap-system.org/lib?ghompcgs?IsPcGroupHomomorphismByImages
+dataconstructor http://www.gap-system.org/lib?ghompcgs?NaturalIsomorphismByPcgs
 theory http://www.gap-system.org/lib?ghompcgs
 HasMeta http://www.gap-system.org/lib?ghompcgs http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?ghompcgs http://www.gap-system.org/lib?type
@@ -141,7 +244,6 @@ Declares http://www.gap-system.org/lib?ghompcgs http://www.gap-system.org/lib?gh
 constant http://www.gap-system.org/lib?ghompcgs?IsToPcGroupGeneralMappingByImages_st15
 Declares http://www.gap-system.org/lib?ghompcgs http://www.gap-system.org/lib?ghompcgs?IsToPcGroupGeneralMappingByImages_st16
 constant http://www.gap-system.org/lib?ghompcgs?IsToPcGroupGeneralMappingByImages_st16
-Includes http://www.gap-system.org/lib?ghompcgs http://www.gap-system.org/lib?ghompcgs
 Declares http://www.gap-system.org/lib?ghompcgs http://www.gap-system.org/lib?ghompcgs?IsToPcGroupHomomorphismByImages
 constant http://www.gap-system.org/lib?ghompcgs?IsToPcGroupHomomorphismByImages
 Declares http://www.gap-system.org/lib?ghompcgs http://www.gap-system.org/lib?ghompcgs?IsGroupGeneralMappingByPcgs
diff --git a/relational/http..www.gap-system.org/lib/ghomperm.rel b/relational/http..www.gap-system.org/lib/ghomperm.rel
index b9e1c7c549c42091c4922ab7d903ee5d5a1e6b2c..11423aac6075f28bfe737b09b7703e8cff23d2c2 100644
--- a/relational/http..www.gap-system.org/lib/ghomperm.rel
+++ b/relational/http..www.gap-system.org/lib/ghomperm.rel
@@ -74,6 +74,84 @@ implies http://www.gap-system.org/lib?ghomperm?IsToPermGroupHomomorphismByImages
 implies http://www.gap-system.org/lib?ghomperm?IsToPermGroupHomomorphismByImages http://www.gap-system.org/lib?mapping?IsTotal
 implies http://www.gap-system.org/lib?ghomperm?IsToPermGroupHomomorphismByImages http://www.gap-system.org/lib?mapping?IsSingleValued
 implies http://www.gap-system.org/lib?ghomperm?IsToPermGroupHomomorphismByImages http://www.gap-system.org/lib?ghomperm?IsToPermGroupGeneralMappingByImages
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsBlocksOfActionHomomorphism
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsBlocksOfActionHomomorphism_st0
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsBlocksOfActionHomomorphism_st1
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsBlocksOfActionHomomorphism_st2
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsBlocksOfActionHomomorphism_st3
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsBlocksOfActionHomomorphism_st4
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsBlocksOfActionHomomorphism_st5
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsBlocksOfActionHomomorphism_st6
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsBlocksOfActionHomomorphism_st7
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsBlocksOfActionHomomorphism_st8
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsBlocksOfActionHomomorphism_st9
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsBlocksOfActionHomomorphism_st10
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsBlocksOfActionHomomorphism_st11
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsBlocksOfActionHomomorphism_st12
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsBlocksOfActionHomomorphism_st13
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsBlocksOfActionHomomorphism_st14
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsBlocksOfActionHomomorphism_st15
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsBlocksOfActionHomomorphism_st16
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsBlocksOfActionHomomorphism_st17
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsBlocksOfActionHomomorphism_st18
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsBlocksOfActionHomomorphism_st19
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsBlocksOfActionHomomorphism_st20
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsBlocksOfActionHomomorphism_st21
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsBlocksOfActionHomomorphism_st22
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsPermGroupGeneralMapping
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsPermGroupGeneralMapping_st0
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsPermGroupGeneralMapping_st1
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsPermGroupGeneralMapping_st2
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsPermGroupGeneralMapping_st3
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsPermGroupGeneralMapping_st4
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsPermGroupGeneralMapping_st5
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsPermGroupGeneralMapping_st6
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsPermGroupGeneralMapping_st7
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsPermGroupGeneralMapping_st8
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsPermGroupGeneralMapping_st9
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsPermGroupGeneralMapping_st10
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsPermGroupGeneralMapping_st11
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsPermGroupGeneralMapping_st12
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsPermGroupGeneralMappingByImages
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsPermGroupGeneralMappingByImages_st0
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsPermGroupGeneralMappingByImages_st1
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsPermGroupGeneralMappingByImages_st2
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsPermGroupGeneralMappingByImages_st3
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsPermGroupGeneralMappingByImages_st4
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsPermGroupGeneralMappingByImages_st5
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsPermGroupGeneralMappingByImages_st6
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsPermGroupGeneralMappingByImages_st7
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsPermGroupGeneralMappingByImages_st8
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsPermGroupGeneralMappingByImages_st9
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsPermGroupGeneralMappingByImages_st10
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsPermGroupGeneralMappingByImages_st11
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsPermGroupGeneralMappingByImages_st12
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsPermGroupGeneralMappingByImages_st13
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsPermGroupGeneralMappingByImages_st14
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsPermGroupGeneralMappingByImages_st15
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsPermGroupGeneralMappingByImages_st16
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsPermGroupGeneralMappingByImages_st17
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsToPermGroupGeneralMappingByImages
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsToPermGroupGeneralMappingByImages_st0
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsToPermGroupGeneralMappingByImages_st1
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsToPermGroupGeneralMappingByImages_st2
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsToPermGroupGeneralMappingByImages_st3
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsToPermGroupGeneralMappingByImages_st4
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsToPermGroupGeneralMappingByImages_st5
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsToPermGroupGeneralMappingByImages_st6
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsToPermGroupGeneralMappingByImages_st7
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsToPermGroupGeneralMappingByImages_st8
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsToPermGroupGeneralMappingByImages_st9
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsToPermGroupGeneralMappingByImages_st10
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsToPermGroupGeneralMappingByImages_st11
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsToPermGroupGeneralMappingByImages_st12
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsToPermGroupGeneralMappingByImages_st13
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsToPermGroupGeneralMappingByImages_st14
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsToPermGroupGeneralMappingByImages_st15
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsToPermGroupGeneralMappingByImages_st16
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsPermGroupHomomorphism
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsPermGroupHomomorphismByImages
+dataconstructor http://www.gap-system.org/lib?ghomperm?IsToPermGroupHomomorphismByImages
 theory http://www.gap-system.org/lib?ghomperm
 HasMeta http://www.gap-system.org/lib?ghomperm http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?ghomperm http://www.gap-system.org/lib?type
@@ -158,7 +236,6 @@ Declares http://www.gap-system.org/lib?ghomperm http://www.gap-system.org/lib?gh
 constant http://www.gap-system.org/lib?ghomperm?IsPermGroupGeneralMapping_st11
 Declares http://www.gap-system.org/lib?ghomperm http://www.gap-system.org/lib?ghomperm?IsPermGroupGeneralMapping_st12
 constant http://www.gap-system.org/lib?ghomperm?IsPermGroupGeneralMapping_st12
-Includes http://www.gap-system.org/lib?ghomperm http://www.gap-system.org/lib?ghomperm
 Declares http://www.gap-system.org/lib?ghomperm http://www.gap-system.org/lib?ghomperm?IsPermGroupGeneralMappingByImages
 constant http://www.gap-system.org/lib?ghomperm?IsPermGroupGeneralMappingByImages
 Declares http://www.gap-system.org/lib?ghomperm http://www.gap-system.org/lib?ghomperm?IsPermGroupGeneralMappingByImages_st0
diff --git a/relational/http..www.gap-system.org/lib/gpprmsya.rel b/relational/http..www.gap-system.org/lib/gpprmsya.rel
index 3a08bdb6890e1ebeb7e8ada9cab854b586d046aa..3d0de12f75dd60690377b86fe0b8aa17229b2e9a 100644
--- a/relational/http..www.gap-system.org/lib/gpprmsya.rel
+++ b/relational/http..www.gap-system.org/lib/gpprmsya.rel
@@ -24,6 +24,13 @@ IsAttribute http://www.gap-system.org/lib?gpprmsya?IsNaturalAlternatingGroup
 implies http://www.gap-system.org/lib?gpprmsya?IsNaturalAlternatingGroup http://www.gap-system.org/lib?permutat?IsPerm
 implies http://www.gap-system.org/lib?gpprmsya?IsNaturalAlternatingGroup http://www.gap-system.org/lib?magma?IsMagmaWithInverses
 implies http://www.gap-system.org/lib?gpprmsya?IsNaturalAlternatingGroup http://www.gap-system.org/lib?magma?IsAssociative
+dataconstructor http://www.gap-system.org/lib?gpprmsya?IsNaturalSymmetricGroup
+dataconstructor http://www.gap-system.org/lib?gpprmsya?IsSymmetricGroup
+dataconstructor http://www.gap-system.org/lib?gpprmsya?IsAlternatingGroup
+dataconstructor http://www.gap-system.org/lib?gpprmsya?SymmetricParentGroup
+dataconstructor http://www.gap-system.org/lib?gpprmsya?AlternatingSubgroup
+dataconstructor http://www.gap-system.org/lib?gpprmsya?OrbitStabilizingParentGroup
+dataconstructor http://www.gap-system.org/lib?gpprmsya?IsNaturalAlternatingGroup
 theory http://www.gap-system.org/lib?gpprmsya
 HasMeta http://www.gap-system.org/lib?gpprmsya http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?gpprmsya http://www.gap-system.org/lib?permutat
diff --git a/relational/http..www.gap-system.org/lib/gprd.rel b/relational/http..www.gap-system.org/lib/gprd.rel
index 519deb8c9e680e9deb88c7d74b1ceb6dacf3d2c7..b4fd30bfb2c5cba6202937ea113edf1e16e2daf9 100644
--- a/relational/http..www.gap-system.org/lib/gprd.rel
+++ b/relational/http..www.gap-system.org/lib/gprd.rel
@@ -63,6 +63,37 @@ implies http://www.gap-system.org/lib?gprd?IsWreathProductElementDefaultRep_st7
 implies http://www.gap-system.org/lib?gprd?IsWreathProductElementDefaultRep_st7 http://www.gap-system.org/lib?arith?IsMultiplicativeElementWithInverse
 implies http://www.gap-system.org/lib?gprd?IsWreathProductElementDefaultRep_st7 http://www.gap-system.org/lib?arith?IsAssociativeElement
 implies http://www.gap-system.org/lib?gprd?IsWreathProductElementDefaultRep_st7 http://www.gap-system.org/lib?gprd?IsWreathProductElement
+dataconstructor http://www.gap-system.org/lib?gprd?WreathProduct
+dataconstructor http://www.gap-system.org/lib?gprd?IsPcgsDirectProductRep
+dataconstructor http://www.gap-system.org/lib?gprd?IsPcgsDirectProductRep_st0
+dataconstructor http://www.gap-system.org/lib?gprd?IsPcgsDirectProductRep_st1
+dataconstructor http://www.gap-system.org/lib?gprd?IsPcgsDirectProductRep_st2
+dataconstructor http://www.gap-system.org/lib?gprd?DirectProductInfo
+dataconstructor http://www.gap-system.org/lib?gprd?IsWreathProductElement
+dataconstructor http://www.gap-system.org/lib?gprd?IsWreathProductElement_st0
+dataconstructor http://www.gap-system.org/lib?gprd?IsWreathProductElement_st1
+dataconstructor http://www.gap-system.org/lib?gprd?IsWreathProductElement_st2
+dataconstructor http://www.gap-system.org/lib?gprd?IsWreathProductElement_st3
+dataconstructor http://www.gap-system.org/lib?gprd?IsWreathProductElement_st4
+dataconstructor http://www.gap-system.org/lib?gprd?IsWreathProductElement_st5
+dataconstructor http://www.gap-system.org/lib?gprd?StandardWreathProduct
+dataconstructor http://www.gap-system.org/lib?gprd?FreeProductOp
+dataconstructor http://www.gap-system.org/lib?gprd?WreathProductInfo
+dataconstructor http://www.gap-system.org/lib?gprd?DirectProductOp
+dataconstructor http://www.gap-system.org/lib?gprd?SubdirectProductInfo
+dataconstructor http://www.gap-system.org/lib?gprd?FreeProductInfo
+dataconstructor http://www.gap-system.org/lib?gprd?SubdirectProductOp
+dataconstructor http://www.gap-system.org/lib?gprd?SemidirectProduct
+dataconstructor http://www.gap-system.org/lib?gprd?SemidirectProductInfo
+dataconstructor http://www.gap-system.org/lib?gprd?IsWreathProductElementDefaultRep
+dataconstructor http://www.gap-system.org/lib?gprd?IsWreathProductElementDefaultRep_st0
+dataconstructor http://www.gap-system.org/lib?gprd?IsWreathProductElementDefaultRep_st1
+dataconstructor http://www.gap-system.org/lib?gprd?IsWreathProductElementDefaultRep_st2
+dataconstructor http://www.gap-system.org/lib?gprd?IsWreathProductElementDefaultRep_st3
+dataconstructor http://www.gap-system.org/lib?gprd?IsWreathProductElementDefaultRep_st4
+dataconstructor http://www.gap-system.org/lib?gprd?IsWreathProductElementDefaultRep_st5
+dataconstructor http://www.gap-system.org/lib?gprd?IsWreathProductElementDefaultRep_st6
+dataconstructor http://www.gap-system.org/lib?gprd?IsWreathProductElementDefaultRep_st7
 theory http://www.gap-system.org/lib?gprd
 HasMeta http://www.gap-system.org/lib?gprd http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?gprd http://www.gap-system.org/lib?magma
@@ -116,7 +147,6 @@ Declares http://www.gap-system.org/lib?gprd http://www.gap-system.org/lib?gprd?S
 constant http://www.gap-system.org/lib?gprd?SemidirectProduct
 Declares http://www.gap-system.org/lib?gprd http://www.gap-system.org/lib?gprd?SemidirectProductInfo
 constant http://www.gap-system.org/lib?gprd?SemidirectProductInfo
-Includes http://www.gap-system.org/lib?gprd http://www.gap-system.org/lib?gprd
 Declares http://www.gap-system.org/lib?gprd http://www.gap-system.org/lib?gprd?IsWreathProductElementDefaultRep
 constant http://www.gap-system.org/lib?gprd?IsWreathProductElementDefaultRep
 Declares http://www.gap-system.org/lib?gprd http://www.gap-system.org/lib?gprd?IsWreathProductElementDefaultRep_st0
diff --git a/relational/http..www.gap-system.org/lib/gprdmat.rel b/relational/http..www.gap-system.org/lib/gprdmat.rel
index d20616bb05e8e40e18918bd04a9626329f41c59d..beb23ec1817ebc066911a24c59c3ee8aac949d67 100644
--- a/relational/http..www.gap-system.org/lib/gprdmat.rel
+++ b/relational/http..www.gap-system.org/lib/gprdmat.rel
@@ -49,6 +49,75 @@ implies http://www.gap-system.org/lib?gprdmat?IsEmbeddingImprimitiveWreathProduc
 implies http://www.gap-system.org/lib?gprdmat?IsEmbeddingImprimitiveWreathProductMatrixGroup_st21 http://www.gap-system.org/lib?mapphomo?RespectsMultiplication
 implies http://www.gap-system.org/lib?gprdmat?IsEmbeddingImprimitiveWreathProductMatrixGroup_st21 http://www.gap-system.org/lib?mapphomo?RespectsOne
 implies http://www.gap-system.org/lib?gprdmat?IsEmbeddingImprimitiveWreathProductMatrixGroup_st21 http://www.gap-system.org/lib?mapphomo?RespectsInverses
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsEmbeddingDirectProductMatrixGroup
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsEmbeddingDirectProductMatrixGroup_st0
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsEmbeddingDirectProductMatrixGroup_st1
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsEmbeddingDirectProductMatrixGroup_st2
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsEmbeddingDirectProductMatrixGroup_st3
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsEmbeddingDirectProductMatrixGroup_st4
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsEmbeddingDirectProductMatrixGroup_st5
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsEmbeddingDirectProductMatrixGroup_st6
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsEmbeddingDirectProductMatrixGroup_st7
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsEmbeddingDirectProductMatrixGroup_st8
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsEmbeddingDirectProductMatrixGroup_st9
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsEmbeddingDirectProductMatrixGroup_st10
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsEmbeddingDirectProductMatrixGroup_st11
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsEmbeddingDirectProductMatrixGroup_st12
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsEmbeddingDirectProductMatrixGroup_st13
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsEmbeddingDirectProductMatrixGroup_st14
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsEmbeddingDirectProductMatrixGroup_st15
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsEmbeddingDirectProductMatrixGroup_st16
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsEmbeddingDirectProductMatrixGroup_st17
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsEmbeddingDirectProductMatrixGroup_st18
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsEmbeddingDirectProductMatrixGroup_st19
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsEmbeddingDirectProductMatrixGroup_st20
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsEmbeddingDirectProductMatrixGroup_st21
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsProjectionDirectProductMatrixGroup
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsProjectionDirectProductMatrixGroup_st0
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsProjectionDirectProductMatrixGroup_st1
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsProjectionDirectProductMatrixGroup_st2
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsProjectionDirectProductMatrixGroup_st3
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsProjectionDirectProductMatrixGroup_st4
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsProjectionDirectProductMatrixGroup_st5
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsProjectionDirectProductMatrixGroup_st6
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsProjectionDirectProductMatrixGroup_st7
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsProjectionDirectProductMatrixGroup_st8
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsProjectionDirectProductMatrixGroup_st9
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsProjectionDirectProductMatrixGroup_st10
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsProjectionDirectProductMatrixGroup_st11
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsProjectionDirectProductMatrixGroup_st12
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsProjectionDirectProductMatrixGroup_st13
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsProjectionDirectProductMatrixGroup_st14
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsProjectionDirectProductMatrixGroup_st15
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsProjectionDirectProductMatrixGroup_st16
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsProjectionDirectProductMatrixGroup_st17
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsProjectionDirectProductMatrixGroup_st18
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsProjectionDirectProductMatrixGroup_st19
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsProjectionDirectProductMatrixGroup_st20
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsProjectionDirectProductMatrixGroup_st21
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsEmbeddingImprimitiveWreathProductMatrixGroup
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsEmbeddingImprimitiveWreathProductMatrixGroup_st0
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsEmbeddingImprimitiveWreathProductMatrixGroup_st1
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsEmbeddingImprimitiveWreathProductMatrixGroup_st2
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsEmbeddingImprimitiveWreathProductMatrixGroup_st3
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsEmbeddingImprimitiveWreathProductMatrixGroup_st4
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsEmbeddingImprimitiveWreathProductMatrixGroup_st5
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsEmbeddingImprimitiveWreathProductMatrixGroup_st6
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsEmbeddingImprimitiveWreathProductMatrixGroup_st7
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsEmbeddingImprimitiveWreathProductMatrixGroup_st8
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsEmbeddingImprimitiveWreathProductMatrixGroup_st9
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsEmbeddingImprimitiveWreathProductMatrixGroup_st10
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsEmbeddingImprimitiveWreathProductMatrixGroup_st11
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsEmbeddingImprimitiveWreathProductMatrixGroup_st12
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsEmbeddingImprimitiveWreathProductMatrixGroup_st13
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsEmbeddingImprimitiveWreathProductMatrixGroup_st14
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsEmbeddingImprimitiveWreathProductMatrixGroup_st15
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsEmbeddingImprimitiveWreathProductMatrixGroup_st16
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsEmbeddingImprimitiveWreathProductMatrixGroup_st17
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsEmbeddingImprimitiveWreathProductMatrixGroup_st18
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsEmbeddingImprimitiveWreathProductMatrixGroup_st19
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsEmbeddingImprimitiveWreathProductMatrixGroup_st20
+dataconstructor http://www.gap-system.org/lib?gprdmat?IsEmbeddingImprimitiveWreathProductMatrixGroup_st21
 theory http://www.gap-system.org/lib?gprdmat
 HasMeta http://www.gap-system.org/lib?gprdmat http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?gprdmat http://www.gap-system.org/lib?type
diff --git a/relational/http..www.gap-system.org/lib/gprdperm.rel b/relational/http..www.gap-system.org/lib/gprdperm.rel
index d406fec91295b6daf2621584edf6fcc7ed5d4ab7..b415070abd45aaa0a2bda9785ff7dcb1a0ccbc5b 100644
--- a/relational/http..www.gap-system.org/lib/gprdperm.rel
+++ b/relational/http..www.gap-system.org/lib/gprdperm.rel
@@ -104,6 +104,148 @@ implies http://www.gap-system.org/lib?gprdperm?IsEmbeddingProductActionWreathPro
 implies http://www.gap-system.org/lib?gprdperm?IsEmbeddingProductActionWreathProductPermGroup_st24 http://www.gap-system.org/lib?ghom?IsPreimagesByAsGroupGeneralMappingByImages
 implies http://www.gap-system.org/lib?gprdperm?IsEmbeddingProductActionWreathProductPermGroup_st24 http://www.gap-system.org/lib?ghom?IsGroupGeneralMappingByAsGroupGeneralMappingByImages
 implies http://www.gap-system.org/lib?gprdperm?IsEmbeddingProductActionWreathProductPermGroup_st24 http://www.gap-system.org/lib?gprdperm?IsEmbeddingWreathProductPermGroup
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingDirectProductPermGroup
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingDirectProductPermGroup_st0
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingDirectProductPermGroup_st1
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingDirectProductPermGroup_st2
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingDirectProductPermGroup_st3
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingDirectProductPermGroup_st4
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingDirectProductPermGroup_st5
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingDirectProductPermGroup_st6
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingDirectProductPermGroup_st7
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingDirectProductPermGroup_st8
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingDirectProductPermGroup_st9
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingDirectProductPermGroup_st10
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingDirectProductPermGroup_st11
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingDirectProductPermGroup_st12
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingDirectProductPermGroup_st13
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingDirectProductPermGroup_st14
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingDirectProductPermGroup_st15
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingDirectProductPermGroup_st16
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingDirectProductPermGroup_st17
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingDirectProductPermGroup_st18
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingDirectProductPermGroup_st19
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingDirectProductPermGroup_st20
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingDirectProductPermGroup_st21
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsProjectionDirectProductPermGroup
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsProjectionDirectProductPermGroup_st0
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsProjectionDirectProductPermGroup_st1
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsProjectionDirectProductPermGroup_st2
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsProjectionDirectProductPermGroup_st3
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsProjectionDirectProductPermGroup_st4
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsProjectionDirectProductPermGroup_st5
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsProjectionDirectProductPermGroup_st6
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsProjectionDirectProductPermGroup_st7
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsProjectionDirectProductPermGroup_st8
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsProjectionDirectProductPermGroup_st9
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsProjectionDirectProductPermGroup_st10
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsProjectionDirectProductPermGroup_st11
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsProjectionDirectProductPermGroup_st12
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsProjectionDirectProductPermGroup_st13
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsProjectionDirectProductPermGroup_st14
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsProjectionDirectProductPermGroup_st15
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsProjectionDirectProductPermGroup_st16
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsProjectionDirectProductPermGroup_st17
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsProjectionDirectProductPermGroup_st18
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsProjectionDirectProductPermGroup_st19
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsProjectionDirectProductPermGroup_st20
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsProjectionDirectProductPermGroup_st21
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingWreathProductPermGroup
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingWreathProductPermGroup_st0
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingWreathProductPermGroup_st1
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingWreathProductPermGroup_st2
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingWreathProductPermGroup_st3
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingWreathProductPermGroup_st4
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingWreathProductPermGroup_st5
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingWreathProductPermGroup_st6
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingWreathProductPermGroup_st7
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingWreathProductPermGroup_st8
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingWreathProductPermGroup_st9
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingWreathProductPermGroup_st10
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingWreathProductPermGroup_st11
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingWreathProductPermGroup_st12
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingWreathProductPermGroup_st13
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingWreathProductPermGroup_st14
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingWreathProductPermGroup_st15
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingWreathProductPermGroup_st16
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingWreathProductPermGroup_st17
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingWreathProductPermGroup_st18
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingWreathProductPermGroup_st19
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingWreathProductPermGroup_st20
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingWreathProductPermGroup_st21
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingImprimitiveWreathProductPermGroup
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingImprimitiveWreathProductPermGroup_st0
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingImprimitiveWreathProductPermGroup_st1
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingImprimitiveWreathProductPermGroup_st2
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingImprimitiveWreathProductPermGroup_st3
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingImprimitiveWreathProductPermGroup_st4
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingImprimitiveWreathProductPermGroup_st5
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingImprimitiveWreathProductPermGroup_st6
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingImprimitiveWreathProductPermGroup_st7
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingImprimitiveWreathProductPermGroup_st8
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingImprimitiveWreathProductPermGroup_st9
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingImprimitiveWreathProductPermGroup_st10
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingImprimitiveWreathProductPermGroup_st11
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingImprimitiveWreathProductPermGroup_st12
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingImprimitiveWreathProductPermGroup_st13
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingImprimitiveWreathProductPermGroup_st14
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingImprimitiveWreathProductPermGroup_st15
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingImprimitiveWreathProductPermGroup_st16
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingImprimitiveWreathProductPermGroup_st17
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingImprimitiveWreathProductPermGroup_st18
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingImprimitiveWreathProductPermGroup_st19
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingImprimitiveWreathProductPermGroup_st20
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingImprimitiveWreathProductPermGroup_st21
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingImprimitiveWreathProductPermGroup_st22
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsProjectionSubdirectProductPermGroup
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsProjectionSubdirectProductPermGroup_st0
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsProjectionSubdirectProductPermGroup_st1
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsProjectionSubdirectProductPermGroup_st2
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsProjectionSubdirectProductPermGroup_st3
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsProjectionSubdirectProductPermGroup_st4
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsProjectionSubdirectProductPermGroup_st5
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsProjectionSubdirectProductPermGroup_st6
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsProjectionSubdirectProductPermGroup_st7
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsProjectionSubdirectProductPermGroup_st8
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsProjectionSubdirectProductPermGroup_st9
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsProjectionSubdirectProductPermGroup_st10
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsProjectionSubdirectProductPermGroup_st11
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsProjectionSubdirectProductPermGroup_st12
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsProjectionSubdirectProductPermGroup_st13
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsProjectionSubdirectProductPermGroup_st14
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsProjectionSubdirectProductPermGroup_st15
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsProjectionSubdirectProductPermGroup_st16
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsProjectionSubdirectProductPermGroup_st17
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsProjectionSubdirectProductPermGroup_st18
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsProjectionSubdirectProductPermGroup_st19
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsProjectionSubdirectProductPermGroup_st20
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsProjectionSubdirectProductPermGroup_st21
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingProductActionWreathProductPermGroup
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingProductActionWreathProductPermGroup_st0
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingProductActionWreathProductPermGroup_st1
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingProductActionWreathProductPermGroup_st2
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingProductActionWreathProductPermGroup_st3
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingProductActionWreathProductPermGroup_st4
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingProductActionWreathProductPermGroup_st5
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingProductActionWreathProductPermGroup_st6
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingProductActionWreathProductPermGroup_st7
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingProductActionWreathProductPermGroup_st8
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingProductActionWreathProductPermGroup_st9
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingProductActionWreathProductPermGroup_st10
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingProductActionWreathProductPermGroup_st11
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingProductActionWreathProductPermGroup_st12
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingProductActionWreathProductPermGroup_st13
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingProductActionWreathProductPermGroup_st14
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingProductActionWreathProductPermGroup_st15
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingProductActionWreathProductPermGroup_st16
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingProductActionWreathProductPermGroup_st17
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingProductActionWreathProductPermGroup_st18
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingProductActionWreathProductPermGroup_st19
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingProductActionWreathProductPermGroup_st20
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingProductActionWreathProductPermGroup_st21
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingProductActionWreathProductPermGroup_st22
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingProductActionWreathProductPermGroup_st23
+dataconstructor http://www.gap-system.org/lib?gprdperm?IsEmbeddingProductActionWreathProductPermGroup_st24
 theory http://www.gap-system.org/lib?gprdperm
 HasMeta http://www.gap-system.org/lib?gprdperm http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?gprdperm http://www.gap-system.org/lib?type
@@ -248,7 +390,6 @@ Declares http://www.gap-system.org/lib?gprdperm http://www.gap-system.org/lib?gp
 constant http://www.gap-system.org/lib?gprdperm?IsEmbeddingWreathProductPermGroup_st20
 Declares http://www.gap-system.org/lib?gprdperm http://www.gap-system.org/lib?gprdperm?IsEmbeddingWreathProductPermGroup_st21
 constant http://www.gap-system.org/lib?gprdperm?IsEmbeddingWreathProductPermGroup_st21
-Includes http://www.gap-system.org/lib?gprdperm http://www.gap-system.org/lib?gprdperm
 Declares http://www.gap-system.org/lib?gprdperm http://www.gap-system.org/lib?gprdperm?IsEmbeddingImprimitiveWreathProductPermGroup
 constant http://www.gap-system.org/lib?gprdperm?IsEmbeddingImprimitiveWreathProductPermGroup
 Declares http://www.gap-system.org/lib?gprdperm http://www.gap-system.org/lib?gprdperm?IsEmbeddingImprimitiveWreathProductPermGroup_st0
diff --git a/relational/http..www.gap-system.org/lib/groebner.rel b/relational/http..www.gap-system.org/lib/groebner.rel
index 26c040c00595b5156cf1e46cfc8ee412df87a75e..9e267bf8473a2eea78d0b646e417a615c831f3ab 100644
--- a/relational/http..www.gap-system.org/lib/groebner.rel
+++ b/relational/http..www.gap-system.org/lib/groebner.rel
@@ -62,12 +62,27 @@ implies http://www.gap-system.org/lib?groebner?IsPolynomialRingIdeal http://www.
 IsAttribute http://www.gap-system.org/lib?groebner?LeadingMonomialOfPolynomial
 implies http://www.gap-system.org/lib?groebner?LeadingMonomialOfPolynomial http://www.gap-system.org/lib?ratfun?IsPolynomialFunction
 implies http://www.gap-system.org/lib?groebner?LeadingMonomialOfPolynomial http://www.gap-system.org/lib?groebner?IsMonomialOrdering
+dataconstructor http://www.gap-system.org/lib?groebner?IsMonomialOrdering
+dataconstructor http://www.gap-system.org/lib?groebner?IsMonomialOrderingDefaultRep
+dataconstructor http://www.gap-system.org/lib?groebner?IsMonomialOrderingDefaultRep_st0
+dataconstructor http://www.gap-system.org/lib?groebner?IsMonomialOrderingDefaultRep_st1
+dataconstructor http://www.gap-system.org/lib?groebner?IsMonomialOrderingDefaultRep_st2
+dataconstructor http://www.gap-system.org/lib?groebner?IsMonomialOrderingDefaultRep_st3
+dataconstructor http://www.gap-system.org/lib?groebner?MonomialComparisonFunction
+dataconstructor http://www.gap-system.org/lib?groebner?ReducedGroebnerBasis
+dataconstructor http://www.gap-system.org/lib?groebner?GroebnerBasis
+dataconstructor http://www.gap-system.org/lib?groebner?StoredGroebnerBasis
+dataconstructor http://www.gap-system.org/lib?groebner?LeadingTermOfPolynomial
+dataconstructor http://www.gap-system.org/lib?groebner?LeadingCoefficientOfPolynomial
+dataconstructor http://www.gap-system.org/lib?groebner?OccuringVariableIndices
+dataconstructor http://www.gap-system.org/lib?groebner?MonomialExtrepComparisonFun
+dataconstructor http://www.gap-system.org/lib?groebner?IsPolynomialRingIdeal
+dataconstructor http://www.gap-system.org/lib?groebner?LeadingMonomialOfPolynomial
 theory http://www.gap-system.org/lib?groebner
 HasMeta http://www.gap-system.org/lib?groebner http://www.gap-system.org/?Types
 Declares http://www.gap-system.org/lib?groebner http://www.gap-system.org/lib?groebner?IsMonomialOrdering
 constant http://www.gap-system.org/lib?groebner?IsMonomialOrdering
 Includes http://www.gap-system.org/lib?groebner http://www.gap-system.org/lib?type
-Includes http://www.gap-system.org/lib?groebner http://www.gap-system.org/lib?groebner
 Declares http://www.gap-system.org/lib?groebner http://www.gap-system.org/lib?groebner?IsMonomialOrderingDefaultRep
 constant http://www.gap-system.org/lib?groebner?IsMonomialOrderingDefaultRep
 Declares http://www.gap-system.org/lib?groebner http://www.gap-system.org/lib?groebner?IsMonomialOrderingDefaultRep_st0
diff --git a/relational/http..www.gap-system.org/lib/grp.rel b/relational/http..www.gap-system.org/lib/grp.rel
index cb5689374b5b98c9300b5695c4c8dd0c8b50e7b9..796953439a2c4a03ec1eb07d69e7e881207ad54e 100644
--- a/relational/http..www.gap-system.org/lib/grp.rel
+++ b/relational/http..www.gap-system.org/lib/grp.rel
@@ -579,6 +579,185 @@ implies http://www.gap-system.org/lib?grp?DimensionsLoewyFactors http://www.gap-
 IsAttribute http://www.gap-system.org/lib?grp?GroupWithGenerators
 implies http://www.gap-system.org/lib?grp?GroupWithGenerators http://www.gap-system.org/lib?coll?IsCollection
 implies http://www.gap-system.org/lib?grp?GroupWithGenerators http://www.gap-system.org/lib?arith?IsMultiplicativeElementWithInverse
+dataconstructor http://www.gap-system.org/lib?grp?NaturalHomomorphism
+dataconstructor http://www.gap-system.org/lib?grp?RationalClasses
+dataconstructor http://www.gap-system.org/lib?grp?ComputedPRumps
+dataconstructor http://www.gap-system.org/lib?grp?IsPSolvable
+dataconstructor http://www.gap-system.org/lib?grp?ComputedSylowComplements
+dataconstructor http://www.gap-system.org/lib?grp?PRump
+dataconstructor http://www.gap-system.org/lib?grp?ComputedAgemos
+dataconstructor http://www.gap-system.org/lib?grp?SylowSubgroupOp
+dataconstructor http://www.gap-system.org/lib?grp?RepresentativesPerfectSubgroups
+dataconstructor http://www.gap-system.org/lib?grp?IsomorphismFpGroupByCompositionSeries
+dataconstructor http://www.gap-system.org/lib?grp?SylowSubgroup
+dataconstructor http://www.gap-system.org/lib?grp?Normalizer
+dataconstructor http://www.gap-system.org/lib?grp?RightTransversal
+dataconstructor http://www.gap-system.org/lib?grp?NormalClosureInParent
+dataconstructor http://www.gap-system.org/lib?grp?IsomorphismFpGroupByGeneratorsNC
+dataconstructor http://www.gap-system.org/lib?grp?ConjugateSubgroup
+dataconstructor http://www.gap-system.org/lib?grp?CanComputeSizeAnySubgroup
+dataconstructor http://www.gap-system.org/lib?grp?CanComputeSizeAnySubgroup_st0
+dataconstructor http://www.gap-system.org/lib?grp?IsSolvableGroup
+dataconstructor http://www.gap-system.org/lib?grp?NormalClosureOp
+dataconstructor http://www.gap-system.org/lib?grp?GrowthFunctionOfGroup
+dataconstructor http://www.gap-system.org/lib?grp?IsRightTransversal
+dataconstructor http://www.gap-system.org/lib?grp?IsRightTransversal_st0
+dataconstructor http://www.gap-system.org/lib?grp?IsRightTransversal_st1
+dataconstructor http://www.gap-system.org/lib?grp?IsPNilpotentOp
+dataconstructor http://www.gap-system.org/lib?grp?RightTransversalInParent
+dataconstructor http://www.gap-system.org/lib?grp?IndependentGeneratorsOfAbelianGroup
+dataconstructor http://www.gap-system.org/lib?grp?IsRightTransversalRep
+dataconstructor http://www.gap-system.org/lib?grp?IsRightTransversalRep_st0
+dataconstructor http://www.gap-system.org/lib?grp?IsRightTransversalRep_st1
+dataconstructor http://www.gap-system.org/lib?grp?IsRightTransversalRep_st2
+dataconstructor http://www.gap-system.org/lib?grp?IsRightTransversalRep_st3
+dataconstructor http://www.gap-system.org/lib?grp?IsRightTransversalRep_st4
+dataconstructor http://www.gap-system.org/lib?grp?ComputedHallSubgroups
+dataconstructor http://www.gap-system.org/lib?grp?IsFinitelyGeneratedGroup
+dataconstructor http://www.gap-system.org/lib?grp?ConjugateGroup
+dataconstructor http://www.gap-system.org/lib?grp?IsPGroup
+dataconstructor http://www.gap-system.org/lib?grp?RankPGroup
+dataconstructor http://www.gap-system.org/lib?grp?MaximalSubgroups
+dataconstructor http://www.gap-system.org/lib?grp?IsConjugate
+dataconstructor http://www.gap-system.org/lib?grp?PrefrattiniSubgroup
+dataconstructor http://www.gap-system.org/lib?grp?AbelianInvariants
+dataconstructor http://www.gap-system.org/lib?grp?IsSubsetLocallyFiniteGroup
+dataconstructor http://www.gap-system.org/lib?grp?CosetTableNormalClosure
+dataconstructor http://www.gap-system.org/lib?grp?MinimalGeneratingSet
+dataconstructor http://www.gap-system.org/lib?grp?ComputedSylowSubgroups
+dataconstructor http://www.gap-system.org/lib?grp?HallSystem
+dataconstructor http://www.gap-system.org/lib?grp?IsPSolvableOp
+dataconstructor http://www.gap-system.org/lib?grp?PrimePowerComponents
+dataconstructor http://www.gap-system.org/lib?grp?IsPolycyclicGroup
+dataconstructor http://www.gap-system.org/lib?grp?CoreInParent
+dataconstructor http://www.gap-system.org/lib?grp?ComplementSystem
+dataconstructor http://www.gap-system.org/lib?grp?CommutatorFactorGroup
+dataconstructor http://www.gap-system.org/lib?grp?GeneratorsSmallest
+dataconstructor http://www.gap-system.org/lib?grp?CanEasilyComputeWithIndependentGensAbelianGroup
+dataconstructor http://www.gap-system.org/lib?grp?Index
+dataconstructor http://www.gap-system.org/lib?grp?PRumpOp
+dataconstructor http://www.gap-system.org/lib?grp?IsSporadicSimpleGroup
+dataconstructor http://www.gap-system.org/lib?grp?CosetTable
+dataconstructor http://www.gap-system.org/lib?grp?ConjugacyClassesSubgroups
+dataconstructor http://www.gap-system.org/lib?grp?OmegaOp
+dataconstructor http://www.gap-system.org/lib?grp?IsSubnormal
+dataconstructor http://www.gap-system.org/lib?grp?IsAlmostSimpleGroup
+dataconstructor http://www.gap-system.org/lib?grp?AsSubgroup
+dataconstructor http://www.gap-system.org/lib?grp?IndexInParent
+dataconstructor http://www.gap-system.org/lib?grp?ConjugacyClassesPerfectSubgroups
+dataconstructor http://www.gap-system.org/lib?grp?KnowsHowToDecompose
+dataconstructor http://www.gap-system.org/lib?grp?SylowSystem
+dataconstructor http://www.gap-system.org/lib?grp?FrattiniSubgroup
+dataconstructor http://www.gap-system.org/lib?grp?IsGroupOfFamily
+dataconstructor http://www.gap-system.org/lib?grp?IsomorphismPermGroup
+dataconstructor http://www.gap-system.org/lib?grp?JenningsSeries
+dataconstructor http://www.gap-system.org/lib?grp?CanEasilyTestMembership
+dataconstructor http://www.gap-system.org/lib?grp?DerivedSeriesOfGroup
+dataconstructor http://www.gap-system.org/lib?grp?PCore
+dataconstructor http://www.gap-system.org/lib?grp?IndexOp
+dataconstructor http://www.gap-system.org/lib?grp?IsElementaryAbelian
+dataconstructor http://www.gap-system.org/lib?grp?IsomorphismFpGroupBySubnormalSeries
+dataconstructor http://www.gap-system.org/lib?grp?IsomorphismFpGroup
+dataconstructor http://www.gap-system.org/lib?grp?PCoreOp
+dataconstructor http://www.gap-system.org/lib?grp?NormalSubgroups
+dataconstructor http://www.gap-system.org/lib?grp?NormalClosure
+dataconstructor http://www.gap-system.org/lib?grp?LowIndexSubgroups
+dataconstructor http://www.gap-system.org/lib?grp?LargestElementGroup
+dataconstructor http://www.gap-system.org/lib?grp?IsNormal
+dataconstructor http://www.gap-system.org/lib?grp?RadicalGroup
+dataconstructor http://www.gap-system.org/lib?grp?IsMonomialGroup
+dataconstructor http://www.gap-system.org/lib?grp?ConjugateSubgroups
+dataconstructor http://www.gap-system.org/lib?grp?FactorGroupNC
+dataconstructor http://www.gap-system.org/lib?grp?DerivedSubgroup
+dataconstructor http://www.gap-system.org/lib?grp?IsCyclic
+dataconstructor http://www.gap-system.org/lib?grp?IsCharacteristicSubgroup
+dataconstructor http://www.gap-system.org/lib?grp?IsNormalOp
+dataconstructor http://www.gap-system.org/lib?grp?ClassMultiplicationCoefficient
+dataconstructor http://www.gap-system.org/lib?grp?ComputedPCentralSeriess
+dataconstructor http://www.gap-system.org/lib?grp?IndexInWholeGroup
+dataconstructor http://www.gap-system.org/lib?grp?CanComputeIndex
+dataconstructor http://www.gap-system.org/lib?grp?UpperCentralSeriesOfGroup
+dataconstructor http://www.gap-system.org/lib?grp?Exponent
+dataconstructor http://www.gap-system.org/lib?grp?IntermediateSubgroups
+dataconstructor http://www.gap-system.org/lib?grp?CentralizerModulo
+dataconstructor http://www.gap-system.org/lib?grp?MaximalAbelianQuotient
+dataconstructor http://www.gap-system.org/lib?grp?SubnormalSeries
+dataconstructor http://www.gap-system.org/lib?grp?NrConjugacyClassesInSupergroup
+dataconstructor http://www.gap-system.org/lib?grp?Core
+dataconstructor http://www.gap-system.org/lib?grp?ElementaryAbelianSeriesLargeSteps
+dataconstructor http://www.gap-system.org/lib?grp?MinimalNormalSubgroups
+dataconstructor http://www.gap-system.org/lib?grp?LowerCentralSeriesOfGroup
+dataconstructor http://www.gap-system.org/lib?grp?NrConjugacyClasses
+dataconstructor http://www.gap-system.org/lib?grp?RightTransversalOp
+dataconstructor http://www.gap-system.org/lib?grp?HallSubgroupOp
+dataconstructor http://www.gap-system.org/lib?grp?IsomorphismTypeInfoFiniteSimpleGroup
+dataconstructor http://www.gap-system.org/lib?grp?AgemoOp
+dataconstructor http://www.gap-system.org/lib?grp?ClosureGroup
+dataconstructor http://www.gap-system.org/lib?grp?Socle
+dataconstructor http://www.gap-system.org/lib?grp?PowerMapOfGroup
+dataconstructor http://www.gap-system.org/lib?grp?MaximalSubgroupClassReps
+dataconstructor http://www.gap-system.org/lib?grp?NormalIntersection
+dataconstructor http://www.gap-system.org/lib?grp?CommutatorLength
+dataconstructor http://www.gap-system.org/lib?grp?ChiefSeriesThrough
+dataconstructor http://www.gap-system.org/lib?grp?NormalizerOp
+dataconstructor http://www.gap-system.org/lib?grp?ComputedPCores
+dataconstructor http://www.gap-system.org/lib?grp?MaximalNormalSubgroups
+dataconstructor http://www.gap-system.org/lib?grp?LatticeSubgroups
+dataconstructor http://www.gap-system.org/lib?grp?IsSupersolvableGroup
+dataconstructor http://www.gap-system.org/lib?grp?IsomorphismSpecialPcGroup
+dataconstructor http://www.gap-system.org/lib?grp?IsomorphismPcGroup
+dataconstructor http://www.gap-system.org/lib?grp?HirschLength
+dataconstructor http://www.gap-system.org/lib?grp?AsGroup
+dataconstructor http://www.gap-system.org/lib?grp?PCentralSeriesOp
+dataconstructor http://www.gap-system.org/lib?grp?NormalHallSubgroups
+dataconstructor http://www.gap-system.org/lib?grp?PCentralSeries
+dataconstructor http://www.gap-system.org/lib?grp?RepresentativesSimpleSubgroups
+dataconstructor http://www.gap-system.org/lib?grp?ComputedOmegas
+dataconstructor http://www.gap-system.org/lib?grp?IsPNilpotent
+dataconstructor http://www.gap-system.org/lib?grp?SylowComplementOp
+dataconstructor http://www.gap-system.org/lib?grp?GroupByGenerators
+dataconstructor http://www.gap-system.org/lib?grp?ComputedIsPNilpotents
+dataconstructor http://www.gap-system.org/lib?grp?IsNilpotentGroup
+dataconstructor http://www.gap-system.org/lib?grp?CommutatorSubgroup
+dataconstructor http://www.gap-system.org/lib?grp?GroupString
+dataconstructor http://www.gap-system.org/lib?grp?SylowComplement
+dataconstructor http://www.gap-system.org/lib?grp?HallSubgroup
+dataconstructor http://www.gap-system.org/lib?grp?SubnormalSeriesInParent
+dataconstructor http://www.gap-system.org/lib?grp?PerfectResiduum
+dataconstructor http://www.gap-system.org/lib?grp?SmallGeneratingSet
+dataconstructor http://www.gap-system.org/lib?grp?PrimePGroup
+dataconstructor http://www.gap-system.org/lib?grp?ChiefSeries
+dataconstructor http://www.gap-system.org/lib?grp?FittingSubgroup
+dataconstructor http://www.gap-system.org/lib?grp?NormalMaximalSubgroups
+dataconstructor http://www.gap-system.org/lib?grp?CoreOp
+dataconstructor http://www.gap-system.org/lib?grp?CompositionSeries
+dataconstructor http://www.gap-system.org/lib?grp?EulerianFunction
+dataconstructor http://www.gap-system.org/lib?grp?NormalizerInParent
+dataconstructor http://www.gap-system.org/lib?grp?InvariantForm
+dataconstructor http://www.gap-system.org/lib?grp?DerivedLength
+dataconstructor http://www.gap-system.org/lib?grp?NilpotencyClassOfGroup
+dataconstructor http://www.gap-system.org/lib?grp?SubnormalSeriesOp
+dataconstructor http://www.gap-system.org/lib?grp?ElementaryAbelianSeries
+dataconstructor http://www.gap-system.org/lib?grp?SupersolvableResiduum
+dataconstructor http://www.gap-system.org/lib?grp?ConjugacyClassesMaximalSubgroups
+dataconstructor http://www.gap-system.org/lib?grp?IsSimpleGroup
+dataconstructor http://www.gap-system.org/lib?grp?IndexNC
+dataconstructor http://www.gap-system.org/lib?grp?ChiefSeriesUnderAction
+dataconstructor http://www.gap-system.org/lib?grp?IndependentGeneratorExponents
+dataconstructor http://www.gap-system.org/lib?grp?Factorization
+dataconstructor http://www.gap-system.org/lib?grp?IsPerfectGroup
+dataconstructor http://www.gap-system.org/lib?grp?IsomorphismFpGroupByChiefSeries
+dataconstructor http://www.gap-system.org/lib?grp?ConjugacyClasses
+dataconstructor http://www.gap-system.org/lib?grp?IsInfiniteAbelianizationGroup
+dataconstructor http://www.gap-system.org/lib?grp?IsGroup
+dataconstructor http://www.gap-system.org/lib?grp?PrimePowerComponent
+dataconstructor http://www.gap-system.org/lib?grp?Omega
+dataconstructor http://www.gap-system.org/lib?grp?ComputedIsPSolvables
+dataconstructor http://www.gap-system.org/lib?grp?PClassPGroup
+dataconstructor http://www.gap-system.org/lib?grp?ElementTestFunction
+dataconstructor http://www.gap-system.org/lib?grp?IsNormalInParent
+dataconstructor http://www.gap-system.org/lib?grp?DimensionsLoewyFactors
+dataconstructor http://www.gap-system.org/lib?grp?GroupWithGenerators
 theory http://www.gap-system.org/lib?grp
 HasMeta http://www.gap-system.org/lib?grp http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?grp http://www.gap-system.org/lib?magma
@@ -643,7 +822,6 @@ constant http://www.gap-system.org/lib?grp?RightTransversalInParent
 Declares http://www.gap-system.org/lib?grp http://www.gap-system.org/lib?grp?IndependentGeneratorsOfAbelianGroup
 constant http://www.gap-system.org/lib?grp?IndependentGeneratorsOfAbelianGroup
 Includes http://www.gap-system.org/lib?grp http://www.gap-system.org/lib?type
-Includes http://www.gap-system.org/lib?grp http://www.gap-system.org/lib?grp
 Declares http://www.gap-system.org/lib?grp http://www.gap-system.org/lib?grp?IsRightTransversalRep
 constant http://www.gap-system.org/lib?grp?IsRightTransversalRep
 Declares http://www.gap-system.org/lib?grp http://www.gap-system.org/lib?grp?IsRightTransversalRep_st0
diff --git a/relational/http..www.gap-system.org/lib/grpffmat.rel b/relational/http..www.gap-system.org/lib/grpffmat.rel
index f73241ab1f761362f3fdd3aadbff3657ece5d06d..dc356fea8b75b2e6701264e83a9dff0173a53a1d 100644
--- a/relational/http..www.gap-system.org/lib/grpffmat.rel
+++ b/relational/http..www.gap-system.org/lib/grpffmat.rel
@@ -5,6 +5,7 @@ implies http://www.gap-system.org/lib?grpffmat?IsFFEMatrixGroup http://www.gap-s
 implies http://www.gap-system.org/lib?grpffmat?IsFFEMatrixGroup http://www.gap-system.org/lib?ffe?IsFFE
 implies http://www.gap-system.org/lib?grpffmat?IsFFEMatrixGroup http://www.gap-system.org/lib?magma?IsMagmaWithInverses
 implies http://www.gap-system.org/lib?grpffmat?IsFFEMatrixGroup http://www.gap-system.org/lib?magma?IsAssociative
+dataconstructor http://www.gap-system.org/lib?grpffmat?IsFFEMatrixGroup
 theory http://www.gap-system.org/lib?grpffmat
 HasMeta http://www.gap-system.org/lib?grpffmat http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?grpffmat http://www.gap-system.org/lib?arith
diff --git a/relational/http..www.gap-system.org/lib/grpfp.rel b/relational/http..www.gap-system.org/lib/grpfp.rel
index 3c099f6509c7ce84fc77cbd0d965f751fa20ca9b..c7f9a4f52c515c2bb4178cddc082605eb9c992a4 100644
--- a/relational/http..www.gap-system.org/lib/grpfp.rel
+++ b/relational/http..www.gap-system.org/lib/grpfp.rel
@@ -140,6 +140,149 @@ implies http://www.gap-system.org/lib?grpfp?CosetTableInWholeGroup http://www.ga
 implies http://www.gap-system.org/lib?grpfp?CosetTableInWholeGroup http://www.gap-system.org/lib?magma?IsAssociative
 IsAttribute http://www.gap-system.org/lib?grpfp?AsSubgroupOfWholeGroupByQuotient
 implies http://www.gap-system.org/lib?grpfp?AsSubgroupOfWholeGroupByQuotient http://www.gap-system.org/lib?grpfp?IsSubgroupFpGroup
+dataconstructor http://www.gap-system.org/lib?grpfp?TryCosetTableInWholeGroup
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFgGroup
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFgGroup_st0
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFgGroup_st1
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFgGroup_st2
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFgGroup_st3
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFgGroup_st4
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFgGroup_st5
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFgGroup_st6
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFgGroup_st7
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFgGroup_st8
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFgGroup_st9
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFgGroup_st10
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFgGroup_st11
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFgGroup_st12
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFgGroup_st13
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFgGroup_st14
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFgGroup_st15
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFgGroup_st16
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFgGroup_st17
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFgGroup_st18
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFgGroup_st19
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFgGroup_st20
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFgGroup_st21
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFgGroup_st22
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFgGroup_st23
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFgGroup_st24
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFgGroup_st25
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFgGroup_st26
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFgGroup_st27
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFgGroup_st28
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFgGroup_st29
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFgGroup_st30
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFgGroup_st31
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFgGroup_st32
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFgGroup_st33
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFgGroup_st34
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFpGroup
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFpGroup_st0
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFpGroup_st1
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFpGroup_st2
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFpGroup_st3
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFpGroup_st4
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFpGroup_st5
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFpGroup_st6
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFpGroup_st7
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFpGroup_st8
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFpGroup_st9
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFpGroup_st10
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFpGroup_st11
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFpGroup_st12
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFpGroup_st13
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFpGroup_st14
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFpGroup_st15
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFpGroup_st16
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFpGroup_st17
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFpGroup_st18
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFpGroup_st19
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFpGroup_st20
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFpGroup_st21
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFpGroup_st22
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFpGroup_st23
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFpGroup_st24
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFpGroup_st25
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFpGroup_st26
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFpGroup_st27
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFpGroup_st28
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFpGroup_st29
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFpGroup_st30
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFpGroup_st31
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFpGroup_st32
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFpGroup_st33
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFpGroup_st34
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupFpGroup_st35
+dataconstructor http://www.gap-system.org/lib?grpfp?FreeGeneratorsOfWholeGroup
+dataconstructor http://www.gap-system.org/lib?grpfp?IsRightTransversalFpGroupRep
+dataconstructor http://www.gap-system.org/lib?grpfp?IsRightTransversalFpGroupRep_st0
+dataconstructor http://www.gap-system.org/lib?grpfp?IsRightTransversalFpGroupRep_st1
+dataconstructor http://www.gap-system.org/lib?grpfp?IsRightTransversalFpGroupRep_st2
+dataconstructor http://www.gap-system.org/lib?grpfp?IsRightTransversalFpGroupRep_st3
+dataconstructor http://www.gap-system.org/lib?grpfp?IsRightTransversalFpGroupRep_st4
+dataconstructor http://www.gap-system.org/lib?grpfp?IsRightTransversalFpGroupRep_st5
+dataconstructor http://www.gap-system.org/lib?grpfp?IsElementOfFpGroup
+dataconstructor http://www.gap-system.org/lib?grpfp?IsElementOfFpGroup_st0
+dataconstructor http://www.gap-system.org/lib?grpfp?IsElementOfFpGroup_st1
+dataconstructor http://www.gap-system.org/lib?grpfp?IsElementOfFpGroup_st2
+dataconstructor http://www.gap-system.org/lib?grpfp?IsElementOfFpGroup_st3
+dataconstructor http://www.gap-system.org/lib?grpfp?IsElementOfFpGroup_st4
+dataconstructor http://www.gap-system.org/lib?grpfp?IsElementOfFpGroup_st5
+dataconstructor http://www.gap-system.org/lib?grpfp?FpElmComparisonMethod
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupOfWholeGroupByQuotientRep
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupOfWholeGroupByQuotientRep_st0
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupOfWholeGroupByQuotientRep_st1
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupOfWholeGroupByQuotientRep_st2
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupOfWholeGroupByQuotientRep_st3
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupOfWholeGroupByQuotientRep_st4
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupOfWholeGroupByQuotientRep_st5
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupOfWholeGroupByQuotientRep_st6
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupOfWholeGroupByQuotientRep_st7
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupOfWholeGroupByQuotientRep_st8
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupOfWholeGroupByQuotientRep_st9
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupOfWholeGroupByQuotientRep_st10
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupOfWholeGroupByQuotientRep_st11
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupOfWholeGroupByQuotientRep_st12
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupOfWholeGroupByQuotientRep_st13
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupOfWholeGroupByQuotientRep_st14
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupOfWholeGroupByQuotientRep_st15
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupOfWholeGroupByQuotientRep_st16
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupOfWholeGroupByQuotientRep_st17
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupOfWholeGroupByQuotientRep_st18
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupOfWholeGroupByQuotientRep_st19
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupOfWholeGroupByQuotientRep_st20
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupOfWholeGroupByQuotientRep_st21
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupOfWholeGroupByQuotientRep_st22
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupOfWholeGroupByQuotientRep_st23
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupOfWholeGroupByQuotientRep_st24
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupOfWholeGroupByQuotientRep_st25
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupOfWholeGroupByQuotientRep_st26
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupOfWholeGroupByQuotientRep_st27
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupOfWholeGroupByQuotientRep_st28
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupOfWholeGroupByQuotientRep_st29
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupOfWholeGroupByQuotientRep_st30
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupOfWholeGroupByQuotientRep_st31
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupOfWholeGroupByQuotientRep_st32
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupOfWholeGroupByQuotientRep_st33
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupOfWholeGroupByQuotientRep_st34
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupOfWholeGroupByQuotientRep_st35
+dataconstructor http://www.gap-system.org/lib?grpfp?IsSubgroupOfWholeGroupByQuotientRep_st36
+dataconstructor http://www.gap-system.org/lib?grpfp?IndicesInvolutaryGenerators
+dataconstructor http://www.gap-system.org/lib?grpfp?StoredExcludedOrders
+dataconstructor http://www.gap-system.org/lib?grpfp?FpElementNFFunction
+dataconstructor http://www.gap-system.org/lib?grpfp?LowIndexSubgroupsFpGroup
+dataconstructor http://www.gap-system.org/lib?grpfp?RelatorsOfFpGroup
+dataconstructor http://www.gap-system.org/lib?grpfp?IsFpGroup
+dataconstructor http://www.gap-system.org/lib?grpfp?FreeGroupOfFpGroup
+dataconstructor http://www.gap-system.org/lib?grpfp?CosetTableNormalClosureInWholeGroup
+dataconstructor http://www.gap-system.org/lib?grpfp?FPFaithHom
+dataconstructor http://www.gap-system.org/lib?grpfp?FpElmEqualityMethod
+dataconstructor http://www.gap-system.org/lib?grpfp?FreeGeneratorsOfFpGroup
+dataconstructor http://www.gap-system.org/lib?grpfp?ElementOfFpGroup
+dataconstructor http://www.gap-system.org/lib?grpfp?LowIndexSubgroupsFpGroupIterator
+dataconstructor http://www.gap-system.org/lib?grpfp?CosetTableInWholeGroup
+dataconstructor http://www.gap-system.org/lib?grpfp?AsSubgroupOfWholeGroupByQuotient
 theory http://www.gap-system.org/lib?grpfp
 HasMeta http://www.gap-system.org/lib?grpfp http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?grpfp http://www.gap-system.org/lib?magma
@@ -222,7 +365,6 @@ Declares http://www.gap-system.org/lib?grpfp http://www.gap-system.org/lib?grpfp
 constant http://www.gap-system.org/lib?grpfp?IsSubgroupFgGroup_st33
 Declares http://www.gap-system.org/lib?grpfp http://www.gap-system.org/lib?grpfp?IsSubgroupFgGroup_st34
 constant http://www.gap-system.org/lib?grpfp?IsSubgroupFgGroup_st34
-Includes http://www.gap-system.org/lib?grpfp http://www.gap-system.org/lib?grpfp
 Declares http://www.gap-system.org/lib?grpfp http://www.gap-system.org/lib?grpfp?IsSubgroupFpGroup
 constant http://www.gap-system.org/lib?grpfp?IsSubgroupFpGroup
 Declares http://www.gap-system.org/lib?grpfp http://www.gap-system.org/lib?grpfp?IsSubgroupFpGroup_st0
diff --git a/relational/http..www.gap-system.org/lib/grplatt.rel b/relational/http..www.gap-system.org/lib/grplatt.rel
index c7f96f876da7035d2fd2f4bf192a3c75f46698bd..42f6f8d2cf79128b27f0a549ea77e1a0f73349dc 100644
--- a/relational/http..www.gap-system.org/lib/grplatt.rel
+++ b/relational/http..www.gap-system.org/lib/grplatt.rel
@@ -40,6 +40,39 @@ implies http://www.gap-system.org/lib?grplatt?MaximalSubgroupsLattice http://www
 IsAttribute http://www.gap-system.org/lib?grplatt?Zuppos
 implies http://www.gap-system.org/lib?grplatt?Zuppos http://www.gap-system.org/lib?magma?IsMagmaWithInverses
 implies http://www.gap-system.org/lib?grplatt?Zuppos http://www.gap-system.org/lib?magma?IsAssociative
+dataconstructor http://www.gap-system.org/lib?grplatt?IsConjugacyClassSubgroupsRep
+dataconstructor http://www.gap-system.org/lib?grplatt?IsConjugacyClassSubgroupsRep_st0
+dataconstructor http://www.gap-system.org/lib?grplatt?IsConjugacyClassSubgroupsRep_st1
+dataconstructor http://www.gap-system.org/lib?grplatt?IsConjugacyClassSubgroupsRep_st2
+dataconstructor http://www.gap-system.org/lib?grplatt?IsConjugacyClassSubgroupsRep_st3
+dataconstructor http://www.gap-system.org/lib?grplatt?IsConjugacyClassSubgroupsRep_st4
+dataconstructor http://www.gap-system.org/lib?grplatt?IsConjugacyClassSubgroupsRep_st5
+dataconstructor http://www.gap-system.org/lib?grplatt?IsConjugacyClassSubgroupsRep_st6
+dataconstructor http://www.gap-system.org/lib?grplatt?IsConjugacyClassSubgroupsRep_st7
+dataconstructor http://www.gap-system.org/lib?grplatt?IsConjugacyClassSubgroupsRep_st8
+dataconstructor http://www.gap-system.org/lib?grplatt?IsConjugacyClassSubgroupsRep_st9
+dataconstructor http://www.gap-system.org/lib?grplatt?ConjugacyClassSubgroups
+dataconstructor http://www.gap-system.org/lib?grplatt?IsLatticeSubgroupsRep
+dataconstructor http://www.gap-system.org/lib?grplatt?IsLatticeSubgroupsRep_st0
+dataconstructor http://www.gap-system.org/lib?grplatt?IsLatticeSubgroupsRep_st1
+dataconstructor http://www.gap-system.org/lib?grplatt?MinimalSupergroupsLattice
+dataconstructor http://www.gap-system.org/lib?grplatt?IsConjugacyClassSubgroupsByStabilizerRep
+dataconstructor http://www.gap-system.org/lib?grplatt?IsConjugacyClassSubgroupsByStabilizerRep_st0
+dataconstructor http://www.gap-system.org/lib?grplatt?IsConjugacyClassSubgroupsByStabilizerRep_st1
+dataconstructor http://www.gap-system.org/lib?grplatt?IsConjugacyClassSubgroupsByStabilizerRep_st2
+dataconstructor http://www.gap-system.org/lib?grplatt?IsConjugacyClassSubgroupsByStabilizerRep_st3
+dataconstructor http://www.gap-system.org/lib?grplatt?IsConjugacyClassSubgroupsByStabilizerRep_st4
+dataconstructor http://www.gap-system.org/lib?grplatt?IsConjugacyClassSubgroupsByStabilizerRep_st5
+dataconstructor http://www.gap-system.org/lib?grplatt?IsConjugacyClassSubgroupsByStabilizerRep_st6
+dataconstructor http://www.gap-system.org/lib?grplatt?IsConjugacyClassSubgroupsByStabilizerRep_st7
+dataconstructor http://www.gap-system.org/lib?grplatt?IsConjugacyClassSubgroupsByStabilizerRep_st8
+dataconstructor http://www.gap-system.org/lib?grplatt?IsConjugacyClassSubgroupsByStabilizerRep_st9
+dataconstructor http://www.gap-system.org/lib?grplatt?IsConjugacyClassSubgroupsByStabilizerRep_st10
+dataconstructor http://www.gap-system.org/lib?grplatt?IsConjugacyClassSubgroupsByStabilizerRep_st11
+dataconstructor http://www.gap-system.org/lib?grplatt?TomDataAlmostSimpleRecognition
+dataconstructor http://www.gap-system.org/lib?grplatt?ClassElementLattice
+dataconstructor http://www.gap-system.org/lib?grplatt?MaximalSubgroupsLattice
+dataconstructor http://www.gap-system.org/lib?grplatt?Zuppos
 theory http://www.gap-system.org/lib?grplatt
 HasMeta http://www.gap-system.org/lib?grplatt http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?grplatt http://www.gap-system.org/lib?type
@@ -78,7 +111,6 @@ Declares http://www.gap-system.org/lib?grplatt http://www.gap-system.org/lib?grp
 constant http://www.gap-system.org/lib?grplatt?IsLatticeSubgroupsRep_st0
 Declares http://www.gap-system.org/lib?grplatt http://www.gap-system.org/lib?grplatt?IsLatticeSubgroupsRep_st1
 constant http://www.gap-system.org/lib?grplatt?IsLatticeSubgroupsRep_st1
-Includes http://www.gap-system.org/lib?grplatt http://www.gap-system.org/lib?grplatt
 Declares http://www.gap-system.org/lib?grplatt http://www.gap-system.org/lib?grplatt?MinimalSupergroupsLattice
 constant http://www.gap-system.org/lib?grplatt?MinimalSupergroupsLattice
 Includes http://www.gap-system.org/lib?grplatt http://www.gap-system.org/lib?clas
diff --git a/relational/http..www.gap-system.org/lib/grpmat.rel b/relational/http..www.gap-system.org/lib/grpmat.rel
index 14fb1011fe3fe0d342876a8a09cefe7a48641e64..c570f62602197d661b0770b4e3748e643bcf3041 100644
--- a/relational/http..www.gap-system.org/lib/grpmat.rel
+++ b/relational/http..www.gap-system.org/lib/grpmat.rel
@@ -101,6 +101,39 @@ implies http://www.gap-system.org/lib?grpmat?InvariantBilinearForm http://www.ga
 implies http://www.gap-system.org/lib?grpmat?InvariantBilinearForm http://www.gap-system.org/lib?arith?IsMultiplicativeElement
 implies http://www.gap-system.org/lib?grpmat?InvariantBilinearForm http://www.gap-system.org/lib?magma?IsMagmaWithInverses
 implies http://www.gap-system.org/lib?grpmat?InvariantBilinearForm http://www.gap-system.org/lib?magma?IsAssociative
+dataconstructor http://www.gap-system.org/lib?grpmat?IsFullSubgroupGLorSLRespectingBilinearForm
+dataconstructor http://www.gap-system.org/lib?grpmat?IsGeneralLinearGroup
+dataconstructor http://www.gap-system.org/lib?grpmat?IsFullSubgroupGLorSLRespectingSesquilinearForm
+dataconstructor http://www.gap-system.org/lib?grpmat?FieldOfMatrixGroup
+dataconstructor http://www.gap-system.org/lib?grpmat?IsNaturalSL
+dataconstructor http://www.gap-system.org/lib?grpmat?IsNaturalGL
+dataconstructor http://www.gap-system.org/lib?grpmat?InvariantSesquilinearForm
+dataconstructor http://www.gap-system.org/lib?grpmat?IsSubgroupSL
+dataconstructor http://www.gap-system.org/lib?grpmat?IsBlowUpIsomorphism
+dataconstructor http://www.gap-system.org/lib?grpmat?IsBlowUpIsomorphism_st0
+dataconstructor http://www.gap-system.org/lib?grpmat?IsBlowUpIsomorphism_st1
+dataconstructor http://www.gap-system.org/lib?grpmat?IsBlowUpIsomorphism_st2
+dataconstructor http://www.gap-system.org/lib?grpmat?IsBlowUpIsomorphism_st3
+dataconstructor http://www.gap-system.org/lib?grpmat?IsBlowUpIsomorphism_st4
+dataconstructor http://www.gap-system.org/lib?grpmat?IsBlowUpIsomorphism_st5
+dataconstructor http://www.gap-system.org/lib?grpmat?IsBlowUpIsomorphism_st6
+dataconstructor http://www.gap-system.org/lib?grpmat?IsBlowUpIsomorphism_st7
+dataconstructor http://www.gap-system.org/lib?grpmat?IsBlowUpIsomorphism_st8
+dataconstructor http://www.gap-system.org/lib?grpmat?IsBlowUpIsomorphism_st9
+dataconstructor http://www.gap-system.org/lib?grpmat?IsBlowUpIsomorphism_st10
+dataconstructor http://www.gap-system.org/lib?grpmat?IsBlowUpIsomorphism_st11
+dataconstructor http://www.gap-system.org/lib?grpmat?IsBlowUpIsomorphism_st12
+dataconstructor http://www.gap-system.org/lib?grpmat?IsBlowUpIsomorphism_st13
+dataconstructor http://www.gap-system.org/lib?grpmat?IsBlowUpIsomorphism_st14
+dataconstructor http://www.gap-system.org/lib?grpmat?IsBlowUpIsomorphism_st15
+dataconstructor http://www.gap-system.org/lib?grpmat?DefaultFieldOfMatrixGroup
+dataconstructor http://www.gap-system.org/lib?grpmat?DimensionOfMatrixGroup
+dataconstructor http://www.gap-system.org/lib?grpmat?InvariantQuadraticForm
+dataconstructor http://www.gap-system.org/lib?grpmat?IsMatrixGroup
+dataconstructor http://www.gap-system.org/lib?grpmat?TransposedMatrixGroup
+dataconstructor http://www.gap-system.org/lib?grpmat?IsSpecialLinearGroup
+dataconstructor http://www.gap-system.org/lib?grpmat?IsFullSubgroupGLorSLRespectingQuadraticForm
+dataconstructor http://www.gap-system.org/lib?grpmat?InvariantBilinearForm
 theory http://www.gap-system.org/lib?grpmat
 HasMeta http://www.gap-system.org/lib?grpmat http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?grpmat http://www.gap-system.org/lib?arith
diff --git a/relational/http..www.gap-system.org/lib/grpnames.rel b/relational/http..www.gap-system.org/lib/grpnames.rel
index b423d0a44e3125b63483c6283e3371e3e074e785..889a09e9d15f2b0edbb4e04d0eea268624defcd6 100644
--- a/relational/http..www.gap-system.org/lib/grpnames.rel
+++ b/relational/http..www.gap-system.org/lib/grpnames.rel
@@ -73,6 +73,31 @@ implies http://www.gap-system.org/lib?grpnames?SLDegree http://www.gap-system.or
 IsAttribute http://www.gap-system.org/lib?grpnames?QuasiDihedralGenerators
 implies http://www.gap-system.org/lib?grpnames?QuasiDihedralGenerators http://www.gap-system.org/lib?magma?IsMagmaWithInverses
 implies http://www.gap-system.org/lib?grpnames?QuasiDihedralGenerators http://www.gap-system.org/lib?magma?IsAssociative
+dataconstructor http://www.gap-system.org/lib?grpnames?DecompositionTypesOfGroup
+dataconstructor http://www.gap-system.org/lib?grpnames?NormalComplement
+dataconstructor http://www.gap-system.org/lib?grpnames?StructureDescription
+dataconstructor http://www.gap-system.org/lib?grpnames?IsTrivialNormalIntersection
+dataconstructor http://www.gap-system.org/lib?grpnames?PSLUnderlyingField
+dataconstructor http://www.gap-system.org/lib?grpnames?GLDegree
+dataconstructor http://www.gap-system.org/lib?grpnames?GLUnderlyingField
+dataconstructor http://www.gap-system.org/lib?grpnames?AlternatingDegree
+dataconstructor http://www.gap-system.org/lib?grpnames?QuaternionGenerators
+dataconstructor http://www.gap-system.org/lib?grpnames?NormalComplementNC
+dataconstructor http://www.gap-system.org/lib?grpnames?IsPSL
+dataconstructor http://www.gap-system.org/lib?grpnames?PSLDegree
+dataconstructor http://www.gap-system.org/lib?grpnames?ParametersOfGroupViewedAsPSL
+dataconstructor http://www.gap-system.org/lib?grpnames?SemidirectFactorsOfGroup
+dataconstructor http://www.gap-system.org/lib?grpnames?ParametersOfGroupViewedAsSL
+dataconstructor http://www.gap-system.org/lib?grpnames?SymmetricDegree
+dataconstructor http://www.gap-system.org/lib?grpnames?IsQuasiDihedralGroup
+dataconstructor http://www.gap-system.org/lib?grpnames?IsQuaternionGroup
+dataconstructor http://www.gap-system.org/lib?grpnames?ParametersOfGroupViewedAsGL
+dataconstructor http://www.gap-system.org/lib?grpnames?DihedralGenerators
+dataconstructor http://www.gap-system.org/lib?grpnames?IsDihedralGroup
+dataconstructor http://www.gap-system.org/lib?grpnames?DirectFactorsOfGroup
+dataconstructor http://www.gap-system.org/lib?grpnames?SLUnderlyingField
+dataconstructor http://www.gap-system.org/lib?grpnames?SLDegree
+dataconstructor http://www.gap-system.org/lib?grpnames?QuasiDihedralGenerators
 theory http://www.gap-system.org/lib?grpnames
 HasMeta http://www.gap-system.org/lib?grpnames http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?grpnames http://www.gap-system.org/lib?magma
diff --git a/relational/http..www.gap-system.org/lib/grpnice.rel b/relational/http..www.gap-system.org/lib/grpnice.rel
index 6fc50cff576bccd9731e6d9d025e798a2568d2a6..b61e3c3ac016c12e237db9063efce334193ee604 100644
--- a/relational/http..www.gap-system.org/lib/grpnice.rel
+++ b/relational/http..www.gap-system.org/lib/grpnice.rel
@@ -21,6 +21,17 @@ IsAttribute http://www.gap-system.org/lib?grpnice?IsCanonicalNiceMonomorphism
 implies http://www.gap-system.org/lib?grpnice?IsCanonicalNiceMonomorphism http://www.gap-system.org/lib?mapping?IsGeneralMapping
 implies http://www.gap-system.org/lib?grpnice?IsCanonicalNiceMonomorphism http://www.gap-system.org/lib?mapphomo?RespectsMultiplication
 implies http://www.gap-system.org/lib?grpnice?IsCanonicalNiceMonomorphism http://www.gap-system.org/lib?mapphomo?RespectsInverses
+dataconstructor http://www.gap-system.org/lib?grpnice?GroupByNiceMonomorphism
+dataconstructor http://www.gap-system.org/lib?grpnice?IsNiceMonomorphism
+dataconstructor http://www.gap-system.org/lib?grpnice?NiceObject
+dataconstructor http://www.gap-system.org/lib?grpnice?SeedFaithfulAction
+dataconstructor http://www.gap-system.org/lib?grpnice?IsHandledByNiceMonomorphism
+dataconstructor http://www.gap-system.org/lib?grpnice?CanonicalNiceMonomorphism
+dataconstructor http://www.gap-system.org/lib?grpnice?IsEnumeratorByNiceomorphismRep
+dataconstructor http://www.gap-system.org/lib?grpnice?IsEnumeratorByNiceomorphismRep_st0
+dataconstructor http://www.gap-system.org/lib?grpnice?IsEnumeratorByNiceomorphismRep_st1
+dataconstructor http://www.gap-system.org/lib?grpnice?NiceMonomorphism
+dataconstructor http://www.gap-system.org/lib?grpnice?IsCanonicalNiceMonomorphism
 theory http://www.gap-system.org/lib?grpnice
 HasMeta http://www.gap-system.org/lib?grpnice http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?grpnice http://www.gap-system.org/lib?mapping
diff --git a/relational/http..www.gap-system.org/lib/grppc.rel b/relational/http..www.gap-system.org/lib/grppc.rel
index 44d2c5313728121affbbcccbdbe116b45c773a69..9e33e963940efa8ed5456a50449e52db115aebad 100644
--- a/relational/http..www.gap-system.org/lib/grppc.rel
+++ b/relational/http..www.gap-system.org/lib/grppc.rel
@@ -81,6 +81,61 @@ implies http://www.gap-system.org/lib?grppc?GeneralizedPcgs http://www.gap-syste
 IsAttribute http://www.gap-system.org/lib?grppc?InducedPcgsWrtHomePcgs
 implies http://www.gap-system.org/lib?grppc?InducedPcgsWrtHomePcgs http://www.gap-system.org/lib?magma?IsMagmaWithInverses
 implies http://www.gap-system.org/lib?grppc?InducedPcgsWrtHomePcgs http://www.gap-system.org/lib?magma?IsAssociative
+dataconstructor http://www.gap-system.org/lib?grppc?CanEasilyComputePcgs
+dataconstructor http://www.gap-system.org/lib?grppc?CanEasilyComputePcgs_st0
+dataconstructor http://www.gap-system.org/lib?grppc?CanEasilyComputePcgs_st1
+dataconstructor http://www.gap-system.org/lib?grppc?CanEasilyComputePcgs_st2
+dataconstructor http://www.gap-system.org/lib?grppc?CanEasilyComputePcgs_st3
+dataconstructor http://www.gap-system.org/lib?grppc?CanEasilyComputePcgs_st4
+dataconstructor http://www.gap-system.org/lib?grppc?CanEasilyComputePcgs_st5
+dataconstructor http://www.gap-system.org/lib?grppc?CanEasilyComputePcgs_st6
+dataconstructor http://www.gap-system.org/lib?grppc?CanEasilyComputePcgs_st7
+dataconstructor http://www.gap-system.org/lib?grppc?CanEasilyComputePcgs_st8
+dataconstructor http://www.gap-system.org/lib?grppc?CanEasilyComputePcgs_st9
+dataconstructor http://www.gap-system.org/lib?grppc?CanEasilyComputePcgs_st10
+dataconstructor http://www.gap-system.org/lib?grppc?CanEasilyComputePcgs_st11
+dataconstructor http://www.gap-system.org/lib?grppc?CanEasilyComputePcgs_st12
+dataconstructor http://www.gap-system.org/lib?grppc?CanEasilyComputePcgs_st13
+dataconstructor http://www.gap-system.org/lib?grppc?CanEasilyComputePcgs_st14
+dataconstructor http://www.gap-system.org/lib?grppc?CanEasilyComputePcgs_st15
+dataconstructor http://www.gap-system.org/lib?grppc?CanEasilyComputePcgs_st16
+dataconstructor http://www.gap-system.org/lib?grppc?CanEasilyComputePcgs_st17
+dataconstructor http://www.gap-system.org/lib?grppc?CanEasilyComputePcgs_st18
+dataconstructor http://www.gap-system.org/lib?grppc?CanEasilyComputePcgs_st19
+dataconstructor http://www.gap-system.org/lib?grppc?CanEasilyComputePcgs_st20
+dataconstructor http://www.gap-system.org/lib?grppc?CanEasilyComputePcgs_st21
+dataconstructor http://www.gap-system.org/lib?grppc?CanEasilyComputePcgs_st22
+dataconstructor http://www.gap-system.org/lib?grppc?CanEasilyComputePcgs_st23
+dataconstructor http://www.gap-system.org/lib?grppc?CanEasilyComputePcgs_st24
+dataconstructor http://www.gap-system.org/lib?grppc?CanEasilyComputePcgs_st25
+dataconstructor http://www.gap-system.org/lib?grppc?CanEasilyComputePcgs_st26
+dataconstructor http://www.gap-system.org/lib?grppc?CanEasilyComputePcgs_st27
+dataconstructor http://www.gap-system.org/lib?grppc?CanEasilyComputePcgs_st28
+dataconstructor http://www.gap-system.org/lib?grppc?CanEasilyComputePcgs_st29
+dataconstructor http://www.gap-system.org/lib?grppc?CanEasilyComputePcgs_st30
+dataconstructor http://www.gap-system.org/lib?grppc?CanEasilyComputePcgs_st31
+dataconstructor http://www.gap-system.org/lib?grppc?CanEasilyComputePcgs_st32
+dataconstructor http://www.gap-system.org/lib?grppc?CanEasilyComputePcgs_st33
+dataconstructor http://www.gap-system.org/lib?grppc?CanEasilyComputePcgs_st34
+dataconstructor http://www.gap-system.org/lib?grppc?CanEasilyComputePcgs_st35
+dataconstructor http://www.gap-system.org/lib?grppc?CanEasilyComputePcgs_st36
+dataconstructor http://www.gap-system.org/lib?grppc?CanEasilyComputePcgs_st37
+dataconstructor http://www.gap-system.org/lib?grppc?CanEasilyComputePcgs_st38
+dataconstructor http://www.gap-system.org/lib?grppc?InducedPcgsOp
+dataconstructor http://www.gap-system.org/lib?grppc?ComputedInducedPcgses
+dataconstructor http://www.gap-system.org/lib?grppc?SubgroupByPcgs
+dataconstructor http://www.gap-system.org/lib?grppc?CanonicalPcgsWrtHomePcgs
+dataconstructor http://www.gap-system.org/lib?grppc?OmegaSeries
+dataconstructor http://www.gap-system.org/lib?grppc?InducedPcgsWrtFamilyPcgs
+dataconstructor http://www.gap-system.org/lib?grppc?HomePcgs
+dataconstructor http://www.gap-system.org/lib?grppc?CanonicalPcgsWrtFamilyPcgs
+dataconstructor http://www.gap-system.org/lib?grppc?InducedPcgs
+dataconstructor http://www.gap-system.org/lib?grppc?Pcgs
+dataconstructor http://www.gap-system.org/lib?grppc?AffineAction
+dataconstructor http://www.gap-system.org/lib?grppc?FamilyPcgs
+dataconstructor http://www.gap-system.org/lib?grppc?LinearAction
+dataconstructor http://www.gap-system.org/lib?grppc?GeneralizedPcgs
+dataconstructor http://www.gap-system.org/lib?grppc?InducedPcgsWrtHomePcgs
 theory http://www.gap-system.org/lib?grppc
 HasMeta http://www.gap-system.org/lib?grppc http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?grppc http://www.gap-system.org/lib?coll
diff --git a/relational/http..www.gap-system.org/lib/grppcaut.rel b/relational/http..www.gap-system.org/lib/grppcaut.rel
index cdfc163a919b4e9f19ca0bd7b70f2f96dc85fe05..0b15045113fe0baa864a88c51983d80a192d58e5 100644
--- a/relational/http..www.gap-system.org/lib/grppcaut.rel
+++ b/relational/http..www.gap-system.org/lib/grppcaut.rel
@@ -1,6 +1,7 @@
 IsAttribute http://www.gap-system.org/lib?grppcaut?IsFrattiniFree
 implies http://www.gap-system.org/lib?grppcaut?IsFrattiniFree http://www.gap-system.org/lib?magma?IsMagmaWithInverses
 implies http://www.gap-system.org/lib?grppcaut?IsFrattiniFree http://www.gap-system.org/lib?magma?IsAssociative
+dataconstructor http://www.gap-system.org/lib?grppcaut?IsFrattiniFree
 theory http://www.gap-system.org/lib?grppcaut
 HasMeta http://www.gap-system.org/lib?grppcaut http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?grppcaut http://www.gap-system.org/lib?magma
diff --git a/relational/http..www.gap-system.org/lib/grppccom.rel b/relational/http..www.gap-system.org/lib/grppccom.rel
index 6e340d9d455315cfd07e71aeb085c314b6c93ffd..6fbd6bac8c8955a594ff41969beda30d53937acb 100644
--- a/relational/http..www.gap-system.org/lib/grppccom.rel
+++ b/relational/http..www.gap-system.org/lib/grppccom.rel
@@ -4,6 +4,8 @@ implies http://www.gap-system.org/lib?grppccom?ComplementClassesRepresentatives
 IsAttribute http://www.gap-system.org/lib?grppccom?ComplementClassesRepresentativesSolvableNC
 implies http://www.gap-system.org/lib?grppccom?ComplementClassesRepresentativesSolvableNC http://www.gap-system.org/lib?magma?IsMagmaWithInverses
 implies http://www.gap-system.org/lib?grppccom?ComplementClassesRepresentativesSolvableNC http://www.gap-system.org/lib?magma?IsAssociative
+dataconstructor http://www.gap-system.org/lib?grppccom?ComplementClassesRepresentatives
+dataconstructor http://www.gap-system.org/lib?grppccom?ComplementClassesRepresentativesSolvableNC
 theory http://www.gap-system.org/lib?grppccom
 HasMeta http://www.gap-system.org/lib?grppccom http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?grppccom http://www.gap-system.org/lib?magma
diff --git a/relational/http..www.gap-system.org/lib/grppcext.rel b/relational/http..www.gap-system.org/lib/grppcext.rel
index bb838feea436a3dad48f6d8226ae3097ebe02a71..1e16209c25bd952e5daf1ee9ce59adbda7fa6f29 100644
--- a/relational/http..www.gap-system.org/lib/grppcext.rel
+++ b/relational/http..www.gap-system.org/lib/grppcext.rel
@@ -31,6 +31,16 @@ IsAttribute http://www.gap-system.org/lib?grppcext?Extensions
 implies http://www.gap-system.org/lib?grppcext?Extensions http://www.gap-system.org/lib?grppc?CanEasilyComputePcgs
 IsAttribute http://www.gap-system.org/lib?grppcext?SplitExtension
 implies http://www.gap-system.org/lib?grppcext?SplitExtension http://www.gap-system.org/lib?grppc?CanEasilyComputePcgs
+dataconstructor http://www.gap-system.org/lib?grppcext?Extension
+dataconstructor http://www.gap-system.org/lib?grppcext?CyclicTopExtensions
+dataconstructor http://www.gap-system.org/lib?grppcext?SocleComplement
+dataconstructor http://www.gap-system.org/lib?grppcext?ModuleOfExtension
+dataconstructor http://www.gap-system.org/lib?grppcext?SocleDimensions
+dataconstructor http://www.gap-system.org/lib?grppcext?TopExtensionsByAutomorphism
+dataconstructor http://www.gap-system.org/lib?grppcext?ExtensionRepresentatives
+dataconstructor http://www.gap-system.org/lib?grppcext?ExtensionNC
+dataconstructor http://www.gap-system.org/lib?grppcext?Extensions
+dataconstructor http://www.gap-system.org/lib?grppcext?SplitExtension
 theory http://www.gap-system.org/lib?grppcext
 HasMeta http://www.gap-system.org/lib?grppcext http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?grppcext http://www.gap-system.org/lib?grppc
diff --git a/relational/http..www.gap-system.org/lib/grppcnrm.rel b/relational/http..www.gap-system.org/lib/grppcnrm.rel
index e12554d6b02a341c60edd9b4871464b1b051d1d3..88d26688edf856e61bc27fe0da029848f5dc88fc 100644
--- a/relational/http..www.gap-system.org/lib/grppcnrm.rel
+++ b/relational/http..www.gap-system.org/lib/grppcnrm.rel
@@ -2,6 +2,7 @@ IsAttribute http://www.gap-system.org/lib?grppcnrm?NormalizerInHomePcgs
 implies http://www.gap-system.org/lib?grppcnrm?NormalizerInHomePcgs http://www.gap-system.org/lib?magma?IsMagmaWithInverses
 implies http://www.gap-system.org/lib?grppcnrm?NormalizerInHomePcgs http://www.gap-system.org/lib?magma?IsAssociative
 implies http://www.gap-system.org/lib?grppcnrm?NormalizerInHomePcgs http://www.gap-system.org/lib?grppc?HomePcgs
+dataconstructor http://www.gap-system.org/lib?grppcnrm?NormalizerInHomePcgs
 theory http://www.gap-system.org/lib?grppcnrm
 HasMeta http://www.gap-system.org/lib?grppcnrm http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?grppcnrm http://www.gap-system.org/lib?magma
diff --git a/relational/http..www.gap-system.org/lib/grpperm.rel b/relational/http..www.gap-system.org/lib/grpperm.rel
index 8fdfc2cdc56030fdaa75e0f266773f2c485c0154..b2a73d18101aa45a9cb720a0b779b150a8788529 100644
--- a/relational/http..www.gap-system.org/lib/grpperm.rel
+++ b/relational/http..www.gap-system.org/lib/grpperm.rel
@@ -22,6 +22,12 @@ IsAttribute http://www.gap-system.org/lib?grpperm?PrimitiveIdentification
 implies http://www.gap-system.org/lib?grpperm?PrimitiveIdentification http://www.gap-system.org/lib?permutat?IsPerm
 implies http://www.gap-system.org/lib?grpperm?PrimitiveIdentification http://www.gap-system.org/lib?magma?IsMagmaWithInverses
 implies http://www.gap-system.org/lib?grpperm?PrimitiveIdentification http://www.gap-system.org/lib?magma?IsAssociative
+dataconstructor http://www.gap-system.org/lib?grpperm?ONanScottType
+dataconstructor http://www.gap-system.org/lib?grpperm?AllBlocks
+dataconstructor http://www.gap-system.org/lib?grpperm?IsPermGroup
+dataconstructor http://www.gap-system.org/lib?grpperm?SocleTypePrimitiveGroup
+dataconstructor http://www.gap-system.org/lib?grpperm?TransitiveIdentification
+dataconstructor http://www.gap-system.org/lib?grpperm?PrimitiveIdentification
 theory http://www.gap-system.org/lib?grpperm
 HasMeta http://www.gap-system.org/lib?grpperm http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?grpperm http://www.gap-system.org/lib?permutat
diff --git a/relational/http..www.gap-system.org/lib/grpramat.rel b/relational/http..www.gap-system.org/lib/grpramat.rel
index acecf1947e697ab2c95619ead5f804abd212c69d..5a69e1bc209a62b79b6df59364b6cd454a2ba5c1 100644
--- a/relational/http..www.gap-system.org/lib/grpramat.rel
+++ b/relational/http..www.gap-system.org/lib/grpramat.rel
@@ -88,6 +88,20 @@ implies http://www.gap-system.org/lib?grpramat?BravaisSubgroups http://www.gap-s
 implies http://www.gap-system.org/lib?grpramat?BravaisSubgroups http://www.gap-system.org/lib?cyclotom?IsCyclotomic
 implies http://www.gap-system.org/lib?grpramat?BravaisSubgroups http://www.gap-system.org/lib?magma?IsMagmaWithInverses
 implies http://www.gap-system.org/lib?grpramat?BravaisSubgroups http://www.gap-system.org/lib?magma?IsAssociative
+dataconstructor http://www.gap-system.org/lib?grpramat?IsCyclotomicMatrixGroup
+dataconstructor http://www.gap-system.org/lib?grpramat?ZClassRepsQClass
+dataconstructor http://www.gap-system.org/lib?grpramat?InvariantLattice
+dataconstructor http://www.gap-system.org/lib?grpramat?BravaisGroup
+dataconstructor http://www.gap-system.org/lib?grpramat?IsIntegerMatrixGroup
+dataconstructor http://www.gap-system.org/lib?grpramat?BravaisSupergroups
+dataconstructor http://www.gap-system.org/lib?grpramat?NormalizerInGLnZBravaisGroup
+dataconstructor http://www.gap-system.org/lib?grpramat?IsNaturalSLnZ
+dataconstructor http://www.gap-system.org/lib?grpramat?IsBravaisGroup
+dataconstructor http://www.gap-system.org/lib?grpramat?IsRationalMatrixGroup
+dataconstructor http://www.gap-system.org/lib?grpramat?CentralizerInGLnZ
+dataconstructor http://www.gap-system.org/lib?grpramat?NormalizerInGLnZ
+dataconstructor http://www.gap-system.org/lib?grpramat?IsNaturalGLnZ
+dataconstructor http://www.gap-system.org/lib?grpramat?BravaisSubgroups
 theory http://www.gap-system.org/lib?grpramat
 HasMeta http://www.gap-system.org/lib?grpramat http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?grpramat http://www.gap-system.org/lib?arith
@@ -108,7 +122,6 @@ constant http://www.gap-system.org/lib?grpramat?BravaisSupergroups
 Declares http://www.gap-system.org/lib?grpramat http://www.gap-system.org/lib?grpramat?NormalizerInGLnZBravaisGroup
 constant http://www.gap-system.org/lib?grpramat?NormalizerInGLnZBravaisGroup
 Includes http://www.gap-system.org/lib?grpramat http://www.gap-system.org/lib?grpmat
-Includes http://www.gap-system.org/lib?grpramat http://www.gap-system.org/lib?grpramat
 Declares http://www.gap-system.org/lib?grpramat http://www.gap-system.org/lib?grpramat?IsNaturalSLnZ
 constant http://www.gap-system.org/lib?grpramat?IsNaturalSLnZ
 Declares http://www.gap-system.org/lib?grpramat http://www.gap-system.org/lib?grpramat?IsBravaisGroup
diff --git a/relational/http..www.gap-system.org/lib/grpreps.rel b/relational/http..www.gap-system.org/lib/grpreps.rel
index cbb4c9b9a2f06b93caf78c8a60a412aef83b77d1..32ade9a0e7e2cb6824c8da250d23d80b4b8ce183 100644
--- a/relational/http..www.gap-system.org/lib/grpreps.rel
+++ b/relational/http..www.gap-system.org/lib/grpreps.rel
@@ -66,6 +66,9 @@ implies http://www.gap-system.org/lib?grpreps?RegularModule http://www.gap-syste
 implies http://www.gap-system.org/lib?grpreps?RegularModule http://www.gap-system.org/lib?semiring?IsLDistributive
 implies http://www.gap-system.org/lib?grpreps?RegularModule http://www.gap-system.org/lib?semiring?IsRDistributive
 implies http://www.gap-system.org/lib?grpreps?RegularModule http://www.gap-system.org/lib?ring?IsEuclideanRing
+dataconstructor http://www.gap-system.org/lib?grpreps?IrreducibleModules
+dataconstructor http://www.gap-system.org/lib?grpreps?AbsolutIrreducibleModules
+dataconstructor http://www.gap-system.org/lib?grpreps?RegularModule
 theory http://www.gap-system.org/lib?grpreps
 HasMeta http://www.gap-system.org/lib?grpreps http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?grpreps http://www.gap-system.org/lib?magma
diff --git a/relational/http..www.gap-system.org/lib/grptbl.rel b/relational/http..www.gap-system.org/lib/grptbl.rel
index 840731e136be4de4f8a2d53284053d117e8322c2..c7f1d126752d1ca4a20f7c8aa8d3a7cd178db335 100644
--- a/relational/http..www.gap-system.org/lib/grptbl.rel
+++ b/relational/http..www.gap-system.org/lib/grptbl.rel
@@ -8,6 +8,14 @@ implies http://www.gap-system.org/lib?grptbl?IsMagmaByMultiplicationTableObj_st5
 implies http://www.gap-system.org/lib?grptbl?IsMagmaByMultiplicationTableObj_st5 http://www.gap-system.org/lib?arith?IsMultiplicativeElement
 implies http://www.gap-system.org/lib?grptbl?IsMagmaByMultiplicationTableObj_st5 http://www.gap-system.org/lib?arith?IsMultiplicativeElementWithOne
 implies http://www.gap-system.org/lib?grptbl?IsMagmaByMultiplicationTableObj_st5 http://www.gap-system.org/lib?arith?IsMultiplicativeElementWithInverse
+dataconstructor http://www.gap-system.org/lib?grptbl?MultiplicationTable
+dataconstructor http://www.gap-system.org/lib?grptbl?IsMagmaByMultiplicationTableObj
+dataconstructor http://www.gap-system.org/lib?grptbl?IsMagmaByMultiplicationTableObj_st0
+dataconstructor http://www.gap-system.org/lib?grptbl?IsMagmaByMultiplicationTableObj_st1
+dataconstructor http://www.gap-system.org/lib?grptbl?IsMagmaByMultiplicationTableObj_st2
+dataconstructor http://www.gap-system.org/lib?grptbl?IsMagmaByMultiplicationTableObj_st3
+dataconstructor http://www.gap-system.org/lib?grptbl?IsMagmaByMultiplicationTableObj_st4
+dataconstructor http://www.gap-system.org/lib?grptbl?IsMagmaByMultiplicationTableObj_st5
 theory http://www.gap-system.org/lib?grptbl
 HasMeta http://www.gap-system.org/lib?grptbl http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?grptbl http://www.gap-system.org/lib?list
diff --git a/relational/http..www.gap-system.org/lib/ideal.rel b/relational/http..www.gap-system.org/lib/ideal.rel
index 2acdad364a43f70134bd4fbfb32fadca304c2705..67f5cb7c6f6aa5a3c5d04bfb4fe9c9b5dfb21af7 100644
--- a/relational/http..www.gap-system.org/lib/ideal.rel
+++ b/relational/http..www.gap-system.org/lib/ideal.rel
@@ -141,6 +141,26 @@ implies http://www.gap-system.org/lib?ideal?IsRightIdealInParent http://www.gap-
 implies http://www.gap-system.org/lib?ideal?IsRightIdealInParent http://www.gap-system.org/lib?addmagma?IsAdditivelyCommutative
 implies http://www.gap-system.org/lib?ideal?IsRightIdealInParent http://www.gap-system.org/lib?semiring?IsLDistributive
 implies http://www.gap-system.org/lib?ideal?IsRightIdealInParent http://www.gap-system.org/lib?semiring?IsRDistributive
+dataconstructor http://www.gap-system.org/lib?ideal?TwoSidedIdealByGenerators
+dataconstructor http://www.gap-system.org/lib?ideal?IsRightIdeal
+dataconstructor http://www.gap-system.org/lib?ideal?IsLeftIdeal
+dataconstructor http://www.gap-system.org/lib?ideal?IsTwoSidedIdeal
+dataconstructor http://www.gap-system.org/lib?ideal?AsTwoSidedIdeal
+dataconstructor http://www.gap-system.org/lib?ideal?LeftActingRingOfIdeal
+dataconstructor http://www.gap-system.org/lib?ideal?RightActingRingOfIdeal
+dataconstructor http://www.gap-system.org/lib?ideal?IsRightIdealOp
+dataconstructor http://www.gap-system.org/lib?ideal?GeneratorsOfRightIdeal
+dataconstructor http://www.gap-system.org/lib?ideal?IsLeftIdealInParent
+dataconstructor http://www.gap-system.org/lib?ideal?IsTwoSidedIdealInParent
+dataconstructor http://www.gap-system.org/lib?ideal?GeneratorsOfLeftIdeal
+dataconstructor http://www.gap-system.org/lib?ideal?IsTwoSidedIdealOp
+dataconstructor http://www.gap-system.org/lib?ideal?RightIdealByGenerators
+dataconstructor http://www.gap-system.org/lib?ideal?AsRightIdeal
+dataconstructor http://www.gap-system.org/lib?ideal?AsLeftIdeal
+dataconstructor http://www.gap-system.org/lib?ideal?IsLeftIdealOp
+dataconstructor http://www.gap-system.org/lib?ideal?LeftIdealByGenerators
+dataconstructor http://www.gap-system.org/lib?ideal?GeneratorsOfTwoSidedIdeal
+dataconstructor http://www.gap-system.org/lib?ideal?IsRightIdealInParent
 theory http://www.gap-system.org/lib?ideal
 HasMeta http://www.gap-system.org/lib?ideal http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?ideal http://www.gap-system.org/lib?magma
diff --git a/relational/http..www.gap-system.org/lib/ieee754.rel b/relational/http..www.gap-system.org/lib/ieee754.rel
index 9ca1653013e1cdf69702bd8f7b47b042393945a4..2b08452c0f6c6cc50d821e28ca8cc45e3349e634 100644
--- a/relational/http..www.gap-system.org/lib/ieee754.rel
+++ b/relational/http..www.gap-system.org/lib/ieee754.rel
@@ -28,6 +28,44 @@ implies http://www.gap-system.org/lib?ieee754?IsIEEE754PseudoField_st36 http://w
 implies http://www.gap-system.org/lib?ieee754?IsIEEE754PseudoField_st36 http://www.gap-system.org/lib?semiring?IsRDistributive
 implies http://www.gap-system.org/lib?ieee754?IsIEEE754PseudoField_st36 http://www.gap-system.org/lib?module?IsFreeLeftModule
 implies http://www.gap-system.org/lib?ieee754?IsIEEE754PseudoField_st36 http://www.gap-system.org/lib?float?IsFloatPseudoField
+dataconstructor http://www.gap-system.org/lib?ieee754?IsIEEE754PseudoField
+dataconstructor http://www.gap-system.org/lib?ieee754?IsIEEE754PseudoField_st0
+dataconstructor http://www.gap-system.org/lib?ieee754?IsIEEE754PseudoField_st1
+dataconstructor http://www.gap-system.org/lib?ieee754?IsIEEE754PseudoField_st2
+dataconstructor http://www.gap-system.org/lib?ieee754?IsIEEE754PseudoField_st3
+dataconstructor http://www.gap-system.org/lib?ieee754?IsIEEE754PseudoField_st4
+dataconstructor http://www.gap-system.org/lib?ieee754?IsIEEE754PseudoField_st5
+dataconstructor http://www.gap-system.org/lib?ieee754?IsIEEE754PseudoField_st6
+dataconstructor http://www.gap-system.org/lib?ieee754?IsIEEE754PseudoField_st7
+dataconstructor http://www.gap-system.org/lib?ieee754?IsIEEE754PseudoField_st8
+dataconstructor http://www.gap-system.org/lib?ieee754?IsIEEE754PseudoField_st9
+dataconstructor http://www.gap-system.org/lib?ieee754?IsIEEE754PseudoField_st10
+dataconstructor http://www.gap-system.org/lib?ieee754?IsIEEE754PseudoField_st11
+dataconstructor http://www.gap-system.org/lib?ieee754?IsIEEE754PseudoField_st12
+dataconstructor http://www.gap-system.org/lib?ieee754?IsIEEE754PseudoField_st13
+dataconstructor http://www.gap-system.org/lib?ieee754?IsIEEE754PseudoField_st14
+dataconstructor http://www.gap-system.org/lib?ieee754?IsIEEE754PseudoField_st15
+dataconstructor http://www.gap-system.org/lib?ieee754?IsIEEE754PseudoField_st16
+dataconstructor http://www.gap-system.org/lib?ieee754?IsIEEE754PseudoField_st17
+dataconstructor http://www.gap-system.org/lib?ieee754?IsIEEE754PseudoField_st18
+dataconstructor http://www.gap-system.org/lib?ieee754?IsIEEE754PseudoField_st19
+dataconstructor http://www.gap-system.org/lib?ieee754?IsIEEE754PseudoField_st20
+dataconstructor http://www.gap-system.org/lib?ieee754?IsIEEE754PseudoField_st21
+dataconstructor http://www.gap-system.org/lib?ieee754?IsIEEE754PseudoField_st22
+dataconstructor http://www.gap-system.org/lib?ieee754?IsIEEE754PseudoField_st23
+dataconstructor http://www.gap-system.org/lib?ieee754?IsIEEE754PseudoField_st24
+dataconstructor http://www.gap-system.org/lib?ieee754?IsIEEE754PseudoField_st25
+dataconstructor http://www.gap-system.org/lib?ieee754?IsIEEE754PseudoField_st26
+dataconstructor http://www.gap-system.org/lib?ieee754?IsIEEE754PseudoField_st27
+dataconstructor http://www.gap-system.org/lib?ieee754?IsIEEE754PseudoField_st28
+dataconstructor http://www.gap-system.org/lib?ieee754?IsIEEE754PseudoField_st29
+dataconstructor http://www.gap-system.org/lib?ieee754?IsIEEE754PseudoField_st30
+dataconstructor http://www.gap-system.org/lib?ieee754?IsIEEE754PseudoField_st31
+dataconstructor http://www.gap-system.org/lib?ieee754?IsIEEE754PseudoField_st32
+dataconstructor http://www.gap-system.org/lib?ieee754?IsIEEE754PseudoField_st33
+dataconstructor http://www.gap-system.org/lib?ieee754?IsIEEE754PseudoField_st34
+dataconstructor http://www.gap-system.org/lib?ieee754?IsIEEE754PseudoField_st35
+dataconstructor http://www.gap-system.org/lib?ieee754?IsIEEE754PseudoField_st36
 theory http://www.gap-system.org/lib?ieee754
 HasMeta http://www.gap-system.org/lib?ieee754 http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?ieee754 http://www.gap-system.org/lib?coll
diff --git a/relational/http..www.gap-system.org/lib/info.rel b/relational/http..www.gap-system.org/lib/info.rel
index a3b0841d71455105538122a2a368ddeab7136dd2..42a07f5d2fe07cc370216849d8d47e32df554003 100644
--- a/relational/http..www.gap-system.org/lib/info.rel
+++ b/relational/http..www.gap-system.org/lib/info.rel
@@ -9,12 +9,17 @@ IsAttribute http://www.gap-system.org/lib?info?InfoLevel
 implies http://www.gap-system.org/lib?info?InfoLevel http://www.gap-system.org/lib?info?IsInfoClass
 IsAttribute http://www.gap-system.org/lib?info?NewInfoClass
 implies http://www.gap-system.org/lib?info?NewInfoClass http://www.gap-system.org/lib?string?IsString
+dataconstructor http://www.gap-system.org/lib?info?IsInfoClass
+dataconstructor http://www.gap-system.org/lib?info?IsInfoSelector
+dataconstructor http://www.gap-system.org/lib?info?IsInfoClassListRep
+dataconstructor http://www.gap-system.org/lib?info?IsInfoClassListRep_st0
+dataconstructor http://www.gap-system.org/lib?info?InfoLevel
+dataconstructor http://www.gap-system.org/lib?info?NewInfoClass
 theory http://www.gap-system.org/lib?info
 HasMeta http://www.gap-system.org/lib?info http://www.gap-system.org/?Types
 Declares http://www.gap-system.org/lib?info http://www.gap-system.org/lib?info?IsInfoClass
 constant http://www.gap-system.org/lib?info?IsInfoClass
 Includes http://www.gap-system.org/lib?info http://www.gap-system.org/lib?list
-Includes http://www.gap-system.org/lib?info http://www.gap-system.org/lib?info
 Declares http://www.gap-system.org/lib?info http://www.gap-system.org/lib?info?IsInfoSelector
 constant http://www.gap-system.org/lib?info?IsInfoSelector
 Includes http://www.gap-system.org/lib?info http://www.gap-system.org/lib?type
diff --git a/relational/http..www.gap-system.org/lib/integer.rel b/relational/http..www.gap-system.org/lib/integer.rel
index cb2c14b52cb30a2e37914426aa9e3843a63bb894..b296728d1c725b78d84ca62c817a1f34ae6eb57c 100644
--- a/relational/http..www.gap-system.org/lib/integer.rel
+++ b/relational/http..www.gap-system.org/lib/integer.rel
@@ -115,6 +115,148 @@ implies http://www.gap-system.org/lib?integer?IsPositiveIntegers_st24 http://www
 implies http://www.gap-system.org/lib?integer?IsPositiveIntegers_st24 http://www.gap-system.org/lib?addmagma?IsAdditivelyCommutative
 implies http://www.gap-system.org/lib?integer?IsPositiveIntegers_st24 http://www.gap-system.org/lib?semiring?IsLDistributive
 implies http://www.gap-system.org/lib?integer?IsPositiveIntegers_st24 http://www.gap-system.org/lib?semiring?IsRDistributive
+dataconstructor http://www.gap-system.org/lib?integer?CoefficientsQadic
+dataconstructor http://www.gap-system.org/lib?integer?IsCanonicalBasisIntegersRep
+dataconstructor http://www.gap-system.org/lib?integer?IsCanonicalBasisIntegersRep_st0
+dataconstructor http://www.gap-system.org/lib?integer?IsCanonicalBasisIntegersRep_st1
+dataconstructor http://www.gap-system.org/lib?integer?IsGaussianIntegers
+dataconstructor http://www.gap-system.org/lib?integer?IsGaussianIntegers_st0
+dataconstructor http://www.gap-system.org/lib?integer?IsGaussianIntegers_st1
+dataconstructor http://www.gap-system.org/lib?integer?IsGaussianIntegers_st2
+dataconstructor http://www.gap-system.org/lib?integer?IsGaussianIntegers_st3
+dataconstructor http://www.gap-system.org/lib?integer?IsGaussianIntegers_st4
+dataconstructor http://www.gap-system.org/lib?integer?IsGaussianIntegers_st5
+dataconstructor http://www.gap-system.org/lib?integer?IsGaussianIntegers_st6
+dataconstructor http://www.gap-system.org/lib?integer?IsGaussianIntegers_st7
+dataconstructor http://www.gap-system.org/lib?integer?IsGaussianIntegers_st8
+dataconstructor http://www.gap-system.org/lib?integer?IsGaussianIntegers_st9
+dataconstructor http://www.gap-system.org/lib?integer?IsGaussianIntegers_st10
+dataconstructor http://www.gap-system.org/lib?integer?IsGaussianIntegers_st11
+dataconstructor http://www.gap-system.org/lib?integer?IsGaussianIntegers_st12
+dataconstructor http://www.gap-system.org/lib?integer?IsGaussianIntegers_st13
+dataconstructor http://www.gap-system.org/lib?integer?IsGaussianIntegers_st14
+dataconstructor http://www.gap-system.org/lib?integer?IsGaussianIntegers_st15
+dataconstructor http://www.gap-system.org/lib?integer?IsGaussianIntegers_st16
+dataconstructor http://www.gap-system.org/lib?integer?IsGaussianIntegers_st17
+dataconstructor http://www.gap-system.org/lib?integer?IsGaussianIntegers_st18
+dataconstructor http://www.gap-system.org/lib?integer?IsGaussianIntegers_st19
+dataconstructor http://www.gap-system.org/lib?integer?IsGaussianIntegers_st20
+dataconstructor http://www.gap-system.org/lib?integer?IsGaussianIntegers_st21
+dataconstructor http://www.gap-system.org/lib?integer?IsGaussianIntegers_st22
+dataconstructor http://www.gap-system.org/lib?integer?IsGaussianIntegers_st23
+dataconstructor http://www.gap-system.org/lib?integer?IsGaussianIntegers_st24
+dataconstructor http://www.gap-system.org/lib?integer?IsGaussianIntegers_st25
+dataconstructor http://www.gap-system.org/lib?integer?IsGaussianIntegers_st26
+dataconstructor http://www.gap-system.org/lib?integer?IsGaussianIntegers_st27
+dataconstructor http://www.gap-system.org/lib?integer?IsGaussianIntegers_st28
+dataconstructor http://www.gap-system.org/lib?integer?IsGaussianIntegers_st29
+dataconstructor http://www.gap-system.org/lib?integer?IsGaussianIntegers_st30
+dataconstructor http://www.gap-system.org/lib?integer?IsGaussianIntegers_st31
+dataconstructor http://www.gap-system.org/lib?integer?IsGaussianIntegers_st32
+dataconstructor http://www.gap-system.org/lib?integer?IsGaussianIntegers_st33
+dataconstructor http://www.gap-system.org/lib?integer?IsGaussianIntegers_st34
+dataconstructor http://www.gap-system.org/lib?integer?IsGaussianIntegers_st35
+dataconstructor http://www.gap-system.org/lib?integer?IsGaussianIntegers_st36
+dataconstructor http://www.gap-system.org/lib?integer?IsGaussianIntegers_st37
+dataconstructor http://www.gap-system.org/lib?integer?IsGaussianIntegers_st38
+dataconstructor http://www.gap-system.org/lib?integer?IsGaussianIntegers_st39
+dataconstructor http://www.gap-system.org/lib?integer?IsGaussianIntegers_st40
+dataconstructor http://www.gap-system.org/lib?integer?IsIntegers
+dataconstructor http://www.gap-system.org/lib?integer?IsIntegers_st0
+dataconstructor http://www.gap-system.org/lib?integer?IsIntegers_st1
+dataconstructor http://www.gap-system.org/lib?integer?IsIntegers_st2
+dataconstructor http://www.gap-system.org/lib?integer?IsIntegers_st3
+dataconstructor http://www.gap-system.org/lib?integer?IsIntegers_st4
+dataconstructor http://www.gap-system.org/lib?integer?IsIntegers_st5
+dataconstructor http://www.gap-system.org/lib?integer?IsIntegers_st6
+dataconstructor http://www.gap-system.org/lib?integer?IsIntegers_st7
+dataconstructor http://www.gap-system.org/lib?integer?IsIntegers_st8
+dataconstructor http://www.gap-system.org/lib?integer?IsIntegers_st9
+dataconstructor http://www.gap-system.org/lib?integer?IsIntegers_st10
+dataconstructor http://www.gap-system.org/lib?integer?IsIntegers_st11
+dataconstructor http://www.gap-system.org/lib?integer?IsIntegers_st12
+dataconstructor http://www.gap-system.org/lib?integer?IsIntegers_st13
+dataconstructor http://www.gap-system.org/lib?integer?IsIntegers_st14
+dataconstructor http://www.gap-system.org/lib?integer?IsIntegers_st15
+dataconstructor http://www.gap-system.org/lib?integer?IsIntegers_st16
+dataconstructor http://www.gap-system.org/lib?integer?IsIntegers_st17
+dataconstructor http://www.gap-system.org/lib?integer?IsIntegers_st18
+dataconstructor http://www.gap-system.org/lib?integer?IsIntegers_st19
+dataconstructor http://www.gap-system.org/lib?integer?IsIntegers_st20
+dataconstructor http://www.gap-system.org/lib?integer?IsIntegers_st21
+dataconstructor http://www.gap-system.org/lib?integer?IsIntegers_st22
+dataconstructor http://www.gap-system.org/lib?integer?IsIntegers_st23
+dataconstructor http://www.gap-system.org/lib?integer?IsIntegers_st24
+dataconstructor http://www.gap-system.org/lib?integer?IsIntegers_st25
+dataconstructor http://www.gap-system.org/lib?integer?IsIntegers_st26
+dataconstructor http://www.gap-system.org/lib?integer?IsIntegers_st27
+dataconstructor http://www.gap-system.org/lib?integer?IsIntegers_st28
+dataconstructor http://www.gap-system.org/lib?integer?IsIntegers_st29
+dataconstructor http://www.gap-system.org/lib?integer?IsIntegers_st30
+dataconstructor http://www.gap-system.org/lib?integer?IsIntegers_st31
+dataconstructor http://www.gap-system.org/lib?integer?IsIntegers_st32
+dataconstructor http://www.gap-system.org/lib?integer?IsIntegers_st33
+dataconstructor http://www.gap-system.org/lib?integer?IsIntegers_st34
+dataconstructor http://www.gap-system.org/lib?integer?IsIntegers_st35
+dataconstructor http://www.gap-system.org/lib?integer?IsIntegers_st36
+dataconstructor http://www.gap-system.org/lib?integer?IsIntegers_st37
+dataconstructor http://www.gap-system.org/lib?integer?IsIntegers_st38
+dataconstructor http://www.gap-system.org/lib?integer?IsNonnegativeIntegers
+dataconstructor http://www.gap-system.org/lib?integer?IsNonnegativeIntegers_st0
+dataconstructor http://www.gap-system.org/lib?integer?IsNonnegativeIntegers_st1
+dataconstructor http://www.gap-system.org/lib?integer?IsNonnegativeIntegers_st2
+dataconstructor http://www.gap-system.org/lib?integer?IsNonnegativeIntegers_st3
+dataconstructor http://www.gap-system.org/lib?integer?IsNonnegativeIntegers_st4
+dataconstructor http://www.gap-system.org/lib?integer?IsNonnegativeIntegers_st5
+dataconstructor http://www.gap-system.org/lib?integer?IsNonnegativeIntegers_st6
+dataconstructor http://www.gap-system.org/lib?integer?IsNonnegativeIntegers_st7
+dataconstructor http://www.gap-system.org/lib?integer?IsNonnegativeIntegers_st8
+dataconstructor http://www.gap-system.org/lib?integer?IsNonnegativeIntegers_st9
+dataconstructor http://www.gap-system.org/lib?integer?IsNonnegativeIntegers_st10
+dataconstructor http://www.gap-system.org/lib?integer?IsNonnegativeIntegers_st11
+dataconstructor http://www.gap-system.org/lib?integer?IsNonnegativeIntegers_st12
+dataconstructor http://www.gap-system.org/lib?integer?IsNonnegativeIntegers_st13
+dataconstructor http://www.gap-system.org/lib?integer?IsNonnegativeIntegers_st14
+dataconstructor http://www.gap-system.org/lib?integer?IsNonnegativeIntegers_st15
+dataconstructor http://www.gap-system.org/lib?integer?IsNonnegativeIntegers_st16
+dataconstructor http://www.gap-system.org/lib?integer?IsNonnegativeIntegers_st17
+dataconstructor http://www.gap-system.org/lib?integer?IsNonnegativeIntegers_st18
+dataconstructor http://www.gap-system.org/lib?integer?IsNonnegativeIntegers_st19
+dataconstructor http://www.gap-system.org/lib?integer?IsNonnegativeIntegers_st20
+dataconstructor http://www.gap-system.org/lib?integer?IsNonnegativeIntegers_st21
+dataconstructor http://www.gap-system.org/lib?integer?IsNonnegativeIntegers_st22
+dataconstructor http://www.gap-system.org/lib?integer?IsNonnegativeIntegers_st23
+dataconstructor http://www.gap-system.org/lib?integer?IsNonnegativeIntegers_st24
+dataconstructor http://www.gap-system.org/lib?integer?IsNonnegativeIntegers_st25
+dataconstructor http://www.gap-system.org/lib?integer?IsNonnegativeIntegers_st26
+dataconstructor http://www.gap-system.org/lib?integer?PartialFactorization
+dataconstructor http://www.gap-system.org/lib?integer?PrimeDivisors
+dataconstructor http://www.gap-system.org/lib?integer?IsPositiveIntegers
+dataconstructor http://www.gap-system.org/lib?integer?IsPositiveIntegers_st0
+dataconstructor http://www.gap-system.org/lib?integer?IsPositiveIntegers_st1
+dataconstructor http://www.gap-system.org/lib?integer?IsPositiveIntegers_st2
+dataconstructor http://www.gap-system.org/lib?integer?IsPositiveIntegers_st3
+dataconstructor http://www.gap-system.org/lib?integer?IsPositiveIntegers_st4
+dataconstructor http://www.gap-system.org/lib?integer?IsPositiveIntegers_st5
+dataconstructor http://www.gap-system.org/lib?integer?IsPositiveIntegers_st6
+dataconstructor http://www.gap-system.org/lib?integer?IsPositiveIntegers_st7
+dataconstructor http://www.gap-system.org/lib?integer?IsPositiveIntegers_st8
+dataconstructor http://www.gap-system.org/lib?integer?IsPositiveIntegers_st9
+dataconstructor http://www.gap-system.org/lib?integer?IsPositiveIntegers_st10
+dataconstructor http://www.gap-system.org/lib?integer?IsPositiveIntegers_st11
+dataconstructor http://www.gap-system.org/lib?integer?IsPositiveIntegers_st12
+dataconstructor http://www.gap-system.org/lib?integer?IsPositiveIntegers_st13
+dataconstructor http://www.gap-system.org/lib?integer?IsPositiveIntegers_st14
+dataconstructor http://www.gap-system.org/lib?integer?IsPositiveIntegers_st15
+dataconstructor http://www.gap-system.org/lib?integer?IsPositiveIntegers_st16
+dataconstructor http://www.gap-system.org/lib?integer?IsPositiveIntegers_st17
+dataconstructor http://www.gap-system.org/lib?integer?IsPositiveIntegers_st18
+dataconstructor http://www.gap-system.org/lib?integer?IsPositiveIntegers_st19
+dataconstructor http://www.gap-system.org/lib?integer?IsPositiveIntegers_st20
+dataconstructor http://www.gap-system.org/lib?integer?IsPositiveIntegers_st21
+dataconstructor http://www.gap-system.org/lib?integer?IsPositiveIntegers_st22
+dataconstructor http://www.gap-system.org/lib?integer?IsPositiveIntegers_st23
+dataconstructor http://www.gap-system.org/lib?integer?IsPositiveIntegers_st24
 theory http://www.gap-system.org/lib?integer
 HasMeta http://www.gap-system.org/lib?integer http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?integer http://www.gap-system.org/lib?cyclotom
diff --git a/relational/http..www.gap-system.org/lib/invsgp.rel b/relational/http..www.gap-system.org/lib/invsgp.rel
index 243d82e9d5334ca35c2bc237178e4a53da0c783d..fb8e3466d5b5ce5f25f33bdbe2737657c0d11702 100644
--- a/relational/http..www.gap-system.org/lib/invsgp.rel
+++ b/relational/http..www.gap-system.org/lib/invsgp.rel
@@ -47,6 +47,23 @@ implies http://www.gap-system.org/lib?invsgp?InverseSubmonoidNC http://www.gap-s
 implies http://www.gap-system.org/lib?invsgp?InverseSubmonoidNC http://www.gap-system.org/lib?magma?IsAssociative
 implies http://www.gap-system.org/lib?invsgp?InverseSubmonoidNC http://www.gap-system.org/lib?semigrp?IsInverseSemigroup
 implies http://www.gap-system.org/lib?invsgp?InverseSubmonoidNC http://www.gap-system.org/lib?coll?IsCollection
+dataconstructor http://www.gap-system.org/lib?invsgp?AsInverseSubsemigroup
+dataconstructor http://www.gap-system.org/lib?invsgp?InverseMonoidByGenerators
+dataconstructor http://www.gap-system.org/lib?invsgp?GeneratorsOfInverseSemigroup
+dataconstructor http://www.gap-system.org/lib?invsgp?IsGeneratorsOfInverseSemigroup
+dataconstructor http://www.gap-system.org/lib?invsgp?NaturalPartialOrder
+dataconstructor http://www.gap-system.org/lib?invsgp?AsInverseSubmonoid
+dataconstructor http://www.gap-system.org/lib?invsgp?GeneratorsOfInverseMonoid
+dataconstructor http://www.gap-system.org/lib?invsgp?ReverseNaturalPartialOrder
+dataconstructor http://www.gap-system.org/lib?invsgp?IsInverseMonoid
+dataconstructor http://www.gap-system.org/lib?invsgp?InverseSubmonoid
+dataconstructor http://www.gap-system.org/lib?invsgp?AsInverseSemigroup
+dataconstructor http://www.gap-system.org/lib?invsgp?InverseSubsemigroupNC
+dataconstructor http://www.gap-system.org/lib?invsgp?AsInverseMonoid
+dataconstructor http://www.gap-system.org/lib?invsgp?IsInverseSubsemigroup
+dataconstructor http://www.gap-system.org/lib?invsgp?InverseSubsemigroup
+dataconstructor http://www.gap-system.org/lib?invsgp?InverseSemigroupByGenerators
+dataconstructor http://www.gap-system.org/lib?invsgp?InverseSubmonoidNC
 theory http://www.gap-system.org/lib?invsgp
 HasMeta http://www.gap-system.org/lib?invsgp http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?invsgp http://www.gap-system.org/lib?coll
diff --git a/relational/http..www.gap-system.org/lib/kbsemi.rel b/relational/http..www.gap-system.org/lib/kbsemi.rel
index ec265e85aebe81cd4897a2e1f63841bb1b7e8b09..56294026f64b9d618e02a85045b282dfb4e85d5d 100644
--- a/relational/http..www.gap-system.org/lib/kbsemi.rel
+++ b/relational/http..www.gap-system.org/lib/kbsemi.rel
@@ -8,6 +8,13 @@ implies http://www.gap-system.org/lib?kbsemi?IsKnuthBendixRewritingSystem_st1 ht
 implies http://www.gap-system.org/lib?kbsemi?IsKnuthBendixRewritingSystem_st1 http://www.gap-system.org/lib?rws?IsRewritingSystem
 IsAttribute http://www.gap-system.org/lib?kbsemi?TzRules
 implies http://www.gap-system.org/lib?kbsemi?TzRules http://www.gap-system.org/lib?kbsemi?IsKnuthBendixRewritingSystem
+dataconstructor http://www.gap-system.org/lib?kbsemi?KnuthBendixRewritingSystem
+dataconstructor http://www.gap-system.org/lib?kbsemi?IsKnuthBendixRewritingSystemRep
+dataconstructor http://www.gap-system.org/lib?kbsemi?IsKnuthBendixRewritingSystemRep_st0
+dataconstructor http://www.gap-system.org/lib?kbsemi?IsKnuthBendixRewritingSystem
+dataconstructor http://www.gap-system.org/lib?kbsemi?IsKnuthBendixRewritingSystem_st0
+dataconstructor http://www.gap-system.org/lib?kbsemi?IsKnuthBendixRewritingSystem_st1
+dataconstructor http://www.gap-system.org/lib?kbsemi?TzRules
 theory http://www.gap-system.org/lib?kbsemi
 HasMeta http://www.gap-system.org/lib?kbsemi http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?kbsemi http://www.gap-system.org/lib?type
@@ -26,6 +33,5 @@ Declares http://www.gap-system.org/lib?kbsemi http://www.gap-system.org/lib?kbse
 constant http://www.gap-system.org/lib?kbsemi?IsKnuthBendixRewritingSystem_st0
 Declares http://www.gap-system.org/lib?kbsemi http://www.gap-system.org/lib?kbsemi?IsKnuthBendixRewritingSystem_st1
 constant http://www.gap-system.org/lib?kbsemi?IsKnuthBendixRewritingSystem_st1
-Includes http://www.gap-system.org/lib?kbsemi http://www.gap-system.org/lib?kbsemi
 Declares http://www.gap-system.org/lib?kbsemi http://www.gap-system.org/lib?kbsemi?TzRules
 constant http://www.gap-system.org/lib?kbsemi?TzRules
diff --git a/relational/http..www.gap-system.org/lib/liefam.rel b/relational/http..www.gap-system.org/lib/liefam.rel
index 0c60fd56ddf57f167c61c02f5759077e2a0a31dd..41699d0c3b2c46e5425e3d7ab74489efc57653f0 100644
--- a/relational/http..www.gap-system.org/lib/liefam.rel
+++ b/relational/http..www.gap-system.org/lib/liefam.rel
@@ -63,6 +63,71 @@ implies http://www.gap-system.org/lib?liefam?IsLieObjectsModule_st25 http://www.
 implies http://www.gap-system.org/lib?liefam?IsLieObjectsModule_st25 http://www.gap-system.org/lib?addmagma?IsAdditivelyCommutative
 implies http://www.gap-system.org/lib?liefam?IsLieObjectsModule_st25 http://www.gap-system.org/lib?module?IsFreeLeftModule
 implies http://www.gap-system.org/lib?liefam?IsLieObjectsModule_st25 http://www.gap-system.org/lib?module?IsHandledByNiceBasis
+dataconstructor http://www.gap-system.org/lib?liefam?IsLieEmbeddingRep
+dataconstructor http://www.gap-system.org/lib?liefam?IsLieEmbeddingRep_st0
+dataconstructor http://www.gap-system.org/lib?liefam?IsLieEmbeddingRep_st1
+dataconstructor http://www.gap-system.org/lib?liefam?LieObject
+dataconstructor http://www.gap-system.org/lib?liefam?LieFamily
+dataconstructor http://www.gap-system.org/lib?liefam?IsLieObject
+dataconstructor http://www.gap-system.org/lib?liefam?IsLieObject_st0
+dataconstructor http://www.gap-system.org/lib?liefam?IsLieObject_st1
+dataconstructor http://www.gap-system.org/lib?liefam?IsLieObject_st2
+dataconstructor http://www.gap-system.org/lib?liefam?IsLieObject_st3
+dataconstructor http://www.gap-system.org/lib?liefam?IsLieObject_st4
+dataconstructor http://www.gap-system.org/lib?liefam?IsLieObject_st5
+dataconstructor http://www.gap-system.org/lib?liefam?IsLieObject_st6
+dataconstructor http://www.gap-system.org/lib?liefam?IsLieObject_st7
+dataconstructor http://www.gap-system.org/lib?liefam?IsLieObject_st8
+dataconstructor http://www.gap-system.org/lib?liefam?IsLieObject_st9
+dataconstructor http://www.gap-system.org/lib?liefam?UnderlyingRingElement
+dataconstructor http://www.gap-system.org/lib?liefam?IsRestrictedLieObjectCollection
+dataconstructor http://www.gap-system.org/lib?liefam?IsRestrictedLieObjectCollection_st0
+dataconstructor http://www.gap-system.org/lib?liefam?IsRestrictedLieObjectCollection_st1
+dataconstructor http://www.gap-system.org/lib?liefam?IsRestrictedLieObjectCollection_st2
+dataconstructor http://www.gap-system.org/lib?liefam?IsRestrictedLieObjectCollection_st3
+dataconstructor http://www.gap-system.org/lib?liefam?IsRestrictedLieObjectCollection_st4
+dataconstructor http://www.gap-system.org/lib?liefam?IsRestrictedLieObjectCollection_st5
+dataconstructor http://www.gap-system.org/lib?liefam?IsRestrictedLieObjectCollection_st6
+dataconstructor http://www.gap-system.org/lib?liefam?IsRestrictedLieObjectCollection_st7
+dataconstructor http://www.gap-system.org/lib?liefam?IsRestrictedLieObjectCollection_st8
+dataconstructor http://www.gap-system.org/lib?liefam?IsRestrictedLieObjectCollection_st9
+dataconstructor http://www.gap-system.org/lib?liefam?IsRestrictedLieObjectCollection_st10
+dataconstructor http://www.gap-system.org/lib?liefam?IsRestrictedLieObjectCollection_st11
+dataconstructor http://www.gap-system.org/lib?liefam?IsRestrictedLieObjectCollection_st12
+dataconstructor http://www.gap-system.org/lib?liefam?IsRestrictedLieObjectCollection_st13
+dataconstructor http://www.gap-system.org/lib?liefam?IsRestrictedLieObjectCollection_st14
+dataconstructor http://www.gap-system.org/lib?liefam?IsRestrictedLieObjectCollection_st15
+dataconstructor http://www.gap-system.org/lib?liefam?IsRestrictedLieObjectCollection_st16
+dataconstructor http://www.gap-system.org/lib?liefam?IsRestrictedLieObjectCollection_st17
+dataconstructor http://www.gap-system.org/lib?liefam?IsRestrictedLieObject
+dataconstructor http://www.gap-system.org/lib?liefam?UnderlyingFamily
+dataconstructor http://www.gap-system.org/lib?liefam?IsLieObjectsModule
+dataconstructor http://www.gap-system.org/lib?liefam?IsLieObjectsModule_st0
+dataconstructor http://www.gap-system.org/lib?liefam?IsLieObjectsModule_st1
+dataconstructor http://www.gap-system.org/lib?liefam?IsLieObjectsModule_st2
+dataconstructor http://www.gap-system.org/lib?liefam?IsLieObjectsModule_st3
+dataconstructor http://www.gap-system.org/lib?liefam?IsLieObjectsModule_st4
+dataconstructor http://www.gap-system.org/lib?liefam?IsLieObjectsModule_st5
+dataconstructor http://www.gap-system.org/lib?liefam?IsLieObjectsModule_st6
+dataconstructor http://www.gap-system.org/lib?liefam?IsLieObjectsModule_st7
+dataconstructor http://www.gap-system.org/lib?liefam?IsLieObjectsModule_st8
+dataconstructor http://www.gap-system.org/lib?liefam?IsLieObjectsModule_st9
+dataconstructor http://www.gap-system.org/lib?liefam?IsLieObjectsModule_st10
+dataconstructor http://www.gap-system.org/lib?liefam?IsLieObjectsModule_st11
+dataconstructor http://www.gap-system.org/lib?liefam?IsLieObjectsModule_st12
+dataconstructor http://www.gap-system.org/lib?liefam?IsLieObjectsModule_st13
+dataconstructor http://www.gap-system.org/lib?liefam?IsLieObjectsModule_st14
+dataconstructor http://www.gap-system.org/lib?liefam?IsLieObjectsModule_st15
+dataconstructor http://www.gap-system.org/lib?liefam?IsLieObjectsModule_st16
+dataconstructor http://www.gap-system.org/lib?liefam?IsLieObjectsModule_st17
+dataconstructor http://www.gap-system.org/lib?liefam?IsLieObjectsModule_st18
+dataconstructor http://www.gap-system.org/lib?liefam?IsLieObjectsModule_st19
+dataconstructor http://www.gap-system.org/lib?liefam?IsLieObjectsModule_st20
+dataconstructor http://www.gap-system.org/lib?liefam?IsLieObjectsModule_st21
+dataconstructor http://www.gap-system.org/lib?liefam?IsLieObjectsModule_st22
+dataconstructor http://www.gap-system.org/lib?liefam?IsLieObjectsModule_st23
+dataconstructor http://www.gap-system.org/lib?liefam?IsLieObjectsModule_st24
+dataconstructor http://www.gap-system.org/lib?liefam?IsLieObjectsModule_st25
 theory http://www.gap-system.org/lib?liefam
 HasMeta http://www.gap-system.org/lib?liefam http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?liefam http://www.gap-system.org/lib?type
@@ -99,7 +164,6 @@ Declares http://www.gap-system.org/lib?liefam http://www.gap-system.org/lib?lief
 constant http://www.gap-system.org/lib?liefam?IsLieObject_st8
 Declares http://www.gap-system.org/lib?liefam http://www.gap-system.org/lib?liefam?IsLieObject_st9
 constant http://www.gap-system.org/lib?liefam?IsLieObject_st9
-Includes http://www.gap-system.org/lib?liefam http://www.gap-system.org/lib?liefam
 Declares http://www.gap-system.org/lib?liefam http://www.gap-system.org/lib?liefam?UnderlyingRingElement
 constant http://www.gap-system.org/lib?liefam?UnderlyingRingElement
 Includes http://www.gap-system.org/lib?liefam http://www.gap-system.org/lib?coll
diff --git a/relational/http..www.gap-system.org/lib/lierep.rel b/relational/http..www.gap-system.org/lib/lierep.rel
index c43ba13bdb60c2fe9f73266552c7bac6845baf40..ab81bd3b187a62f331a9ed9afcd1ac1198fcccd9 100644
--- a/relational/http..www.gap-system.org/lib/lierep.rel
+++ b/relational/http..www.gap-system.org/lib/lierep.rel
@@ -191,6 +191,100 @@ implies http://www.gap-system.org/lib?lierep?ConjugateDominantWeightWithWord htt
 IsAttribute http://www.gap-system.org/lib?lierep?ConjugateDominantWeight
 implies http://www.gap-system.org/lib?lierep?ConjugateDominantWeight http://www.gap-system.org/lib?lierep?IsWeylGroup
 implies http://www.gap-system.org/lib?lierep?ConjugateDominantWeight http://www.gap-system.org/lib?list?IsList
+dataconstructor http://www.gap-system.org/lib?lierep?DominantCharacter
+dataconstructor http://www.gap-system.org/lib?lierep?DominantWeights
+dataconstructor http://www.gap-system.org/lib?lierep?IsBasisOfWeightRepElementSpace
+dataconstructor http://www.gap-system.org/lib?lierep?IsBasisOfWeightRepElementSpace_st0
+dataconstructor http://www.gap-system.org/lib?lierep?IsBasisOfWeightRepElementSpace_st1
+dataconstructor http://www.gap-system.org/lib?lierep?IsBasisOfWeightRepElementSpace_st2
+dataconstructor http://www.gap-system.org/lib?lierep?IsBasisOfWeightRepElementSpace_st3
+dataconstructor http://www.gap-system.org/lib?lierep?IsBasisOfWeightRepElementSpace_st4
+dataconstructor http://www.gap-system.org/lib?lierep?IsBasisOfWeightRepElementSpace_st5
+dataconstructor http://www.gap-system.org/lib?lierep?IsBasisOfWeightRepElementSpace_st6
+dataconstructor http://www.gap-system.org/lib?lierep?Coboundaries
+dataconstructor http://www.gap-system.org/lib?lierep?IsWeylGroup
+dataconstructor http://www.gap-system.org/lib?lierep?SparseCartanMatrix
+dataconstructor http://www.gap-system.org/lib?lierep?LatticeGeneratorsInUEA
+dataconstructor http://www.gap-system.org/lib?lierep?PositiveRootsAsWeights
+dataconstructor http://www.gap-system.org/lib?lierep?Cochain
+dataconstructor http://www.gap-system.org/lib?lierep?IsSearchTable
+dataconstructor http://www.gap-system.org/lib?lierep?IsVectorSearchTable
+dataconstructor http://www.gap-system.org/lib?lierep?IsVectorSearchTable_st0
+dataconstructor http://www.gap-system.org/lib?lierep?IsCochain
+dataconstructor http://www.gap-system.org/lib?lierep?IsCochain_st0
+dataconstructor http://www.gap-system.org/lib?lierep?IsCochain_st1
+dataconstructor http://www.gap-system.org/lib?lierep?IsCochain_st2
+dataconstructor http://www.gap-system.org/lib?lierep?IsCochain_st3
+dataconstructor http://www.gap-system.org/lib?lierep?IsCochain_st4
+dataconstructor http://www.gap-system.org/lib?lierep?IsCochain_st5
+dataconstructor http://www.gap-system.org/lib?lierep?IsCochain_st6
+dataconstructor http://www.gap-system.org/lib?lierep?WeylOrbitIterator
+dataconstructor http://www.gap-system.org/lib?lierep?Cocycles
+dataconstructor http://www.gap-system.org/lib?lierep?IsVectorSearchTableDefaultRep
+dataconstructor http://www.gap-system.org/lib?lierep?IsVectorSearchTableDefaultRep_st0
+dataconstructor http://www.gap-system.org/lib?lierep?IsVectorSearchTableDefaultRep_st1
+dataconstructor http://www.gap-system.org/lib?lierep?IsVectorSearchTableDefaultRep_st2
+dataconstructor http://www.gap-system.org/lib?lierep?IsVectorSearchTableDefaultRep_st3
+dataconstructor http://www.gap-system.org/lib?lierep?Search
+dataconstructor http://www.gap-system.org/lib?lierep?WeylGroup
+dataconstructor http://www.gap-system.org/lib?lierep?HighestWeightModule
+dataconstructor http://www.gap-system.org/lib?lierep?IsZeroCochainRep
+dataconstructor http://www.gap-system.org/lib?lierep?IsZeroCochainRep_st0
+dataconstructor http://www.gap-system.org/lib?lierep?IsZeroCochainRep_st1
+dataconstructor http://www.gap-system.org/lib?lierep?Insert
+dataconstructor http://www.gap-system.org/lib?lierep?IsUEALatticeElement
+dataconstructor http://www.gap-system.org/lib?lierep?IsUEALatticeElement_st0
+dataconstructor http://www.gap-system.org/lib?lierep?IsUEALatticeElement_st1
+dataconstructor http://www.gap-system.org/lib?lierep?IsUEALatticeElement_st2
+dataconstructor http://www.gap-system.org/lib?lierep?IsUEALatticeElement_st3
+dataconstructor http://www.gap-system.org/lib?lierep?IsUEALatticeElement_st4
+dataconstructor http://www.gap-system.org/lib?lierep?IsUEALatticeElement_st5
+dataconstructor http://www.gap-system.org/lib?lierep?IsUEALatticeElement_st6
+dataconstructor http://www.gap-system.org/lib?lierep?IsUEALatticeElement_st7
+dataconstructor http://www.gap-system.org/lib?lierep?IsUEALatticeElement_st8
+dataconstructor http://www.gap-system.org/lib?lierep?LeadingUEALatticeMonomial
+dataconstructor http://www.gap-system.org/lib?lierep?DecomposeTensorProduct
+dataconstructor http://www.gap-system.org/lib?lierep?DimensionOfHighestWeightModule
+dataconstructor http://www.gap-system.org/lib?lierep?LongestWeylWordPerm
+dataconstructor http://www.gap-system.org/lib?lierep?IsWeightRepElement
+dataconstructor http://www.gap-system.org/lib?lierep?IsWeightRepElement_st0
+dataconstructor http://www.gap-system.org/lib?lierep?IsWeightRepElement_st1
+dataconstructor http://www.gap-system.org/lib?lierep?IsWeightRepElement_st2
+dataconstructor http://www.gap-system.org/lib?lierep?IsWeightRepElement_st3
+dataconstructor http://www.gap-system.org/lib?lierep?IsWeightRepElement_st4
+dataconstructor http://www.gap-system.org/lib?lierep?IsWeightRepElement_st5
+dataconstructor http://www.gap-system.org/lib?lierep?IsWeightRepElement_st6
+dataconstructor http://www.gap-system.org/lib?lierep?CochainSpace
+dataconstructor http://www.gap-system.org/lib?lierep?IsCochainsSpace
+dataconstructor http://www.gap-system.org/lib?lierep?IsCochainsSpace_st0
+dataconstructor http://www.gap-system.org/lib?lierep?IsCochainsSpace_st1
+dataconstructor http://www.gap-system.org/lib?lierep?IsCochainsSpace_st2
+dataconstructor http://www.gap-system.org/lib?lierep?IsCochainsSpace_st3
+dataconstructor http://www.gap-system.org/lib?lierep?IsCochainsSpace_st4
+dataconstructor http://www.gap-system.org/lib?lierep?IsCochainsSpace_st5
+dataconstructor http://www.gap-system.org/lib?lierep?IsCochainsSpace_st6
+dataconstructor http://www.gap-system.org/lib?lierep?IsCochainsSpace_st7
+dataconstructor http://www.gap-system.org/lib?lierep?IsCochainsSpace_st8
+dataconstructor http://www.gap-system.org/lib?lierep?IsCochainsSpace_st9
+dataconstructor http://www.gap-system.org/lib?lierep?IsCochainsSpace_st10
+dataconstructor http://www.gap-system.org/lib?lierep?IsCochainsSpace_st11
+dataconstructor http://www.gap-system.org/lib?lierep?IsCochainsSpace_st12
+dataconstructor http://www.gap-system.org/lib?lierep?IsCochainsSpace_st13
+dataconstructor http://www.gap-system.org/lib?lierep?IsCochainsSpace_st14
+dataconstructor http://www.gap-system.org/lib?lierep?IsCochainsSpace_st15
+dataconstructor http://www.gap-system.org/lib?lierep?IsCochainsSpace_st16
+dataconstructor http://www.gap-system.org/lib?lierep?IsCochainsSpace_st17
+dataconstructor http://www.gap-system.org/lib?lierep?IsCochainsSpace_st18
+dataconstructor http://www.gap-system.org/lib?lierep?IsCochainsSpace_st19
+dataconstructor http://www.gap-system.org/lib?lierep?IsCochainsSpace_st20
+dataconstructor http://www.gap-system.org/lib?lierep?IsCochainsSpace_st21
+dataconstructor http://www.gap-system.org/lib?lierep?IsCochainsSpace_st22
+dataconstructor http://www.gap-system.org/lib?lierep?IsCochainsSpace_st23
+dataconstructor http://www.gap-system.org/lib?lierep?IsCochainsSpace_st24
+dataconstructor http://www.gap-system.org/lib?lierep?IsCochainsSpace_st25
+dataconstructor http://www.gap-system.org/lib?lierep?ApplySimpleReflection
+dataconstructor http://www.gap-system.org/lib?lierep?ConjugateDominantWeightWithWord
+dataconstructor http://www.gap-system.org/lib?lierep?ConjugateDominantWeight
 theory http://www.gap-system.org/lib?lierep
 HasMeta http://www.gap-system.org/lib?lierep http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?lierep http://www.gap-system.org/lib?alglie
@@ -224,7 +318,6 @@ constant http://www.gap-system.org/lib?lierep?Coboundaries
 Includes http://www.gap-system.org/lib?lierep http://www.gap-system.org/lib?magma
 Declares http://www.gap-system.org/lib?lierep http://www.gap-system.org/lib?lierep?IsWeylGroup
 constant http://www.gap-system.org/lib?lierep?IsWeylGroup
-Includes http://www.gap-system.org/lib?lierep http://www.gap-system.org/lib?lierep
 Declares http://www.gap-system.org/lib?lierep http://www.gap-system.org/lib?lierep?SparseCartanMatrix
 constant http://www.gap-system.org/lib?lierep?SparseCartanMatrix
 Includes http://www.gap-system.org/lib?lierep http://www.gap-system.org/lib?extlset
diff --git a/relational/http..www.gap-system.org/lib/list.rel b/relational/http..www.gap-system.org/lib/list.rel
index a83a8a9f990eb50841386c2ce5b6ab3ef9ac8fee..03bc2ffd78a76c165128d455a56a33e76f5dd710 100644
--- a/relational/http..www.gap-system.org/lib/list.rel
+++ b/relational/http..www.gap-system.org/lib/list.rel
@@ -249,6 +249,133 @@ implies http://www.gap-system.org/lib?list?[] http://www.gap-system.org/lib?cycl
 implies http://www.gap-system.org/lib?list?[] http://www.gap-system.org/lib?matobj1?IsMatrixObj
 implies http://www.gap-system.org/lib?list?[] http://www.gap-system.org/lib?reesmat?IsReesMatrixSemigroupElement
 implies http://www.gap-system.org/lib?list?[] http://www.gap-system.org/lib?reesmat?IsReesZeroMatrixSemigroupElement
+dataconstructor http://www.gap-system.org/lib?list?IsDuplicateFree
+dataconstructor http://www.gap-system.org/lib?list?IsList
+dataconstructor http://www.gap-system.org/lib?list?IsList_st0
+dataconstructor http://www.gap-system.org/lib?list?IsDenseList
+dataconstructor http://www.gap-system.org/lib?list?IsDenseList_st0
+dataconstructor http://www.gap-system.org/lib?list?IsDenseList_st1
+dataconstructor http://www.gap-system.org/lib?list?IsHomogeneousList
+dataconstructor http://www.gap-system.org/lib?list?IsHomogeneousList_st0
+dataconstructor http://www.gap-system.org/lib?list?IsHomogeneousList_st1
+dataconstructor http://www.gap-system.org/lib?list?IsHomogeneousList_st2
+dataconstructor http://www.gap-system.org/lib?list?IsConstantTimeAccessList
+dataconstructor http://www.gap-system.org/lib?list?IsConstantTimeAccessList_st0
+dataconstructor http://www.gap-system.org/lib?list?IsConstantTimeAccessList_st1
+dataconstructor http://www.gap-system.org/lib?list?Shuffle
+dataconstructor http://www.gap-system.org/lib?list?IsSmallList
+dataconstructor http://www.gap-system.org/lib?list?PositionSortedOp
+dataconstructor http://www.gap-system.org/lib?list?IsBound[]
+dataconstructor http://www.gap-system.org/lib?list?IsTable
+dataconstructor http://www.gap-system.org/lib?list?IsTable_st0
+dataconstructor http://www.gap-system.org/lib?list?IsTable_st1
+dataconstructor http://www.gap-system.org/lib?list?IsTable_st2
+dataconstructor http://www.gap-system.org/lib?list?IsTable_st3
+dataconstructor http://www.gap-system.org/lib?list?IsTable_st4
+dataconstructor http://www.gap-system.org/lib?list?IsMatchingSublist
+dataconstructor http://www.gap-system.org/lib?list?IsNSortedList
+dataconstructor http://www.gap-system.org/lib?list?Permuted
+dataconstructor http://www.gap-system.org/lib?list?Position
+dataconstructor http://www.gap-system.org/lib?list?IsRectangularTable
+dataconstructor http://www.gap-system.org/lib?list?Length
+dataconstructor http://www.gap-system.org/lib?list?Append
+dataconstructor http://www.gap-system.org/lib?list?Collected
+dataconstructor http://www.gap-system.org/lib?list?IsDuplicateFreeList
+dataconstructor http://www.gap-system.org/lib?list?MaximumList
+dataconstructor http://www.gap-system.org/lib?list?Remove
+dataconstructor http://www.gap-system.org/lib?list?Sort
+dataconstructor http://www.gap-system.org/lib?list?IsSSortedList
+dataconstructor http://www.gap-system.org/lib?list?IsSortedList
+dataconstructor http://www.gap-system.org/lib?list?PositionsProperty
+dataconstructor http://www.gap-system.org/lib?list?SortingPerm
+dataconstructor http://www.gap-system.org/lib?list?SortBy
+dataconstructor http://www.gap-system.org/lib?list?{}:=
+dataconstructor http://www.gap-system.org/lib?list?{}
+dataconstructor http://www.gap-system.org/lib?list?DuplicateFreeList
+dataconstructor http://www.gap-system.org/lib?list?Unbind[]
+dataconstructor http://www.gap-system.org/lib?list?Compacted
+dataconstructor http://www.gap-system.org/lib?list?PositionBound
+dataconstructor http://www.gap-system.org/lib?list?IsPositionsList
+dataconstructor http://www.gap-system.org/lib?list?IsListDefault
+dataconstructor http://www.gap-system.org/lib?list?IsListDefault_st0
+dataconstructor http://www.gap-system.org/lib?list?IsListDefault_st1
+dataconstructor http://www.gap-system.org/lib?list?IsListDefault_st2
+dataconstructor http://www.gap-system.org/lib?list?IsListDefault_st3
+dataconstructor http://www.gap-system.org/lib?list?IsListDefault_st4
+dataconstructor http://www.gap-system.org/lib?list?IsListDefault_st5
+dataconstructor http://www.gap-system.org/lib?list?IsListDefault_st6
+dataconstructor http://www.gap-system.org/lib?list?IsListDefault_st7
+dataconstructor http://www.gap-system.org/lib?list?IsListDefault_st8
+dataconstructor http://www.gap-system.org/lib?list?PositionsOp
+dataconstructor http://www.gap-system.org/lib?list?ReversedOp
+dataconstructor http://www.gap-system.org/lib?list?IsRangeRep
+dataconstructor http://www.gap-system.org/lib?list?IsRangeRep_st0
+dataconstructor http://www.gap-system.org/lib?list?IsQuickPositionList
+dataconstructor http://www.gap-system.org/lib?list?IsBlistRep
+dataconstructor http://www.gap-system.org/lib?list?IsBlistRep_st0
+dataconstructor http://www.gap-system.org/lib?list?IsPlistRep
+dataconstructor http://www.gap-system.org/lib?list?IsPlistRep_st0
+dataconstructor http://www.gap-system.org/lib?list?IsPlistRep_st1
+dataconstructor http://www.gap-system.org/lib?list?[]:=
+dataconstructor http://www.gap-system.org/lib?list?Sortex
+dataconstructor http://www.gap-system.org/lib?list?AsDuplicateFreeList
+dataconstructor http://www.gap-system.org/lib?list?IsBlist
+dataconstructor http://www.gap-system.org/lib?list?IsBlist_st0
+dataconstructor http://www.gap-system.org/lib?list?IsBlist_st1
+dataconstructor http://www.gap-system.org/lib?list?IsBlist_st2
+dataconstructor http://www.gap-system.org/lib?list?IsBlist_st3
+dataconstructor http://www.gap-system.org/lib?list?Elm0List
+dataconstructor http://www.gap-system.org/lib?list?Add
+dataconstructor http://www.gap-system.org/lib?list?ConstantTimeAccessList
+dataconstructor http://www.gap-system.org/lib?list?PositionCanonical
+dataconstructor http://www.gap-system.org/lib?list?Flat
+dataconstructor http://www.gap-system.org/lib?list?PlainListCopyOp
+dataconstructor http://www.gap-system.org/lib?list?Iterated
+dataconstructor http://www.gap-system.org/lib?list?StableSortBy
+dataconstructor http://www.gap-system.org/lib?list?DifferenceLists
+dataconstructor http://www.gap-system.org/lib?list?SortParallel
+dataconstructor http://www.gap-system.org/lib?list?StableSortParallel
+dataconstructor http://www.gap-system.org/lib?list?PositionNonZero
+dataconstructor http://www.gap-system.org/lib?list?IsRange
+dataconstructor http://www.gap-system.org/lib?list?IsRange_st0
+dataconstructor http://www.gap-system.org/lib?list?IsRange_st1
+dataconstructor http://www.gap-system.org/lib?list?IsRange_st2
+dataconstructor http://www.gap-system.org/lib?list?IsRange_st3
+dataconstructor http://www.gap-system.org/lib?list?IsRange_st4
+dataconstructor http://www.gap-system.org/lib?list?IsRange_st5
+dataconstructor http://www.gap-system.org/lib?list?IsRange_st6
+dataconstructor http://www.gap-system.org/lib?list?IsRange_st7
+dataconstructor http://www.gap-system.org/lib?list?IsRange_st8
+dataconstructor http://www.gap-system.org/lib?list?IsRange_st9
+dataconstructor http://www.gap-system.org/lib?list?IsRange_st10
+dataconstructor http://www.gap-system.org/lib?list?IsRange_st11
+dataconstructor http://www.gap-system.org/lib?list?IsRange_st12
+dataconstructor http://www.gap-system.org/lib?list?IsRange_st13
+dataconstructor http://www.gap-system.org/lib?list?IsRange_st14
+dataconstructor http://www.gap-system.org/lib?list?IsRange_st15
+dataconstructor http://www.gap-system.org/lib?list?IsRange_st16
+dataconstructor http://www.gap-system.org/lib?list?IsRange_st17
+dataconstructor http://www.gap-system.org/lib?list?IsRange_st18
+dataconstructor http://www.gap-system.org/lib?list?IsRange_st19
+dataconstructor http://www.gap-system.org/lib?list?IsRange_st20
+dataconstructor http://www.gap-system.org/lib?list?IsRange_st21
+dataconstructor http://www.gap-system.org/lib?list?IsRange_st22
+dataconstructor http://www.gap-system.org/lib?list?IsRange_st23
+dataconstructor http://www.gap-system.org/lib?list?IsRange_st24
+dataconstructor http://www.gap-system.org/lib?list?IsRange_st25
+dataconstructor http://www.gap-system.org/lib?list?IsRange_st26
+dataconstructor http://www.gap-system.org/lib?list?IsRange_st27
+dataconstructor http://www.gap-system.org/lib?list?IsRange_st28
+dataconstructor http://www.gap-system.org/lib?list?IsDuplicateFreeCollection
+dataconstructor http://www.gap-system.org/lib?list?PositionNot
+dataconstructor http://www.gap-system.org/lib?list?MinimumList
+dataconstructor http://www.gap-system.org/lib?list?PositionNthOccurrence
+dataconstructor http://www.gap-system.org/lib?list?FirstOp
+dataconstructor http://www.gap-system.org/lib?list?PositionProperty
+dataconstructor http://www.gap-system.org/lib?list?PositionSublist
+dataconstructor http://www.gap-system.org/lib?list?StableSort
+dataconstructor http://www.gap-system.org/lib?list?AsPlist
+dataconstructor http://www.gap-system.org/lib?list?[]
 theory http://www.gap-system.org/lib?list
 HasMeta http://www.gap-system.org/lib?list http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?list http://www.gap-system.org/lib?coll
@@ -258,7 +385,6 @@ Declares http://www.gap-system.org/lib?list http://www.gap-system.org/lib?list?I
 constant http://www.gap-system.org/lib?list?IsList
 Declares http://www.gap-system.org/lib?list http://www.gap-system.org/lib?list?IsList_st0
 constant http://www.gap-system.org/lib?list?IsList_st0
-Includes http://www.gap-system.org/lib?list http://www.gap-system.org/lib?list
 Declares http://www.gap-system.org/lib?list http://www.gap-system.org/lib?list?IsDenseList
 constant http://www.gap-system.org/lib?list?IsDenseList
 Declares http://www.gap-system.org/lib?list http://www.gap-system.org/lib?list?IsDenseList_st0
diff --git a/relational/http..www.gap-system.org/lib/listcoef.rel b/relational/http..www.gap-system.org/lib/listcoef.rel
index e4478fa95143c8cf24bd23eb012666c544f6736a..9adbfdb2ea6516b4d78a67613ec91a5960da82dd 100644
--- a/relational/http..www.gap-system.org/lib/listcoef.rel
+++ b/relational/http..www.gap-system.org/lib/listcoef.rel
@@ -109,6 +109,31 @@ implies http://www.gap-system.org/lib?listcoef?MultCoeffs http://www.gap-system.
 IsAttribute http://www.gap-system.org/lib?listcoef?CoeffsMod
 implies http://www.gap-system.org/lib?listcoef?CoeffsMod http://www.gap-system.org/lib?list?IsList
 implies http://www.gap-system.org/lib?listcoef?CoeffsMod http://www.gap-system.org/lib?cyclotom?IsInt
+dataconstructor http://www.gap-system.org/lib?listcoef?AClosestVectorCombinationsMatFFEVecFFE
+dataconstructor http://www.gap-system.org/lib?listcoef?RemoveOuterCoeffs
+dataconstructor http://www.gap-system.org/lib?listcoef?LeftShiftRowVector
+dataconstructor http://www.gap-system.org/lib?listcoef?ShiftedCoeffs
+dataconstructor http://www.gap-system.org/lib?listcoef?ShrinkRowVector
+dataconstructor http://www.gap-system.org/lib?listcoef?DistanceVecFFE
+dataconstructor http://www.gap-system.org/lib?listcoef?PadCoeffs
+dataconstructor http://www.gap-system.org/lib?listcoef?PowerModCoeffs
+dataconstructor http://www.gap-system.org/lib?listcoef?ValuePol
+dataconstructor http://www.gap-system.org/lib?listcoef?WeightVecFFE
+dataconstructor http://www.gap-system.org/lib?listcoef?CosetLeadersMatFFE
+dataconstructor http://www.gap-system.org/lib?listcoef?AddToListEntries
+dataconstructor http://www.gap-system.org/lib?listcoef?MultRowVector
+dataconstructor http://www.gap-system.org/lib?listcoef?ReduceCoeffsMod
+dataconstructor http://www.gap-system.org/lib?listcoef?AClosestVectorCombinationsMatFFEVecFFECoords
+dataconstructor http://www.gap-system.org/lib?listcoef?QuotRemCoeffs
+dataconstructor http://www.gap-system.org/lib?listcoef?AddCoeffs
+dataconstructor http://www.gap-system.org/lib?listcoef?AddRowVector
+dataconstructor http://www.gap-system.org/lib?listcoef?DistancesDistributionVecFFEsVecFFE
+dataconstructor http://www.gap-system.org/lib?listcoef?ReduceCoeffs
+dataconstructor http://www.gap-system.org/lib?listcoef?ProductCoeffs
+dataconstructor http://www.gap-system.org/lib?listcoef?RightShiftRowVector
+dataconstructor http://www.gap-system.org/lib?listcoef?DistancesDistributionMatFFEVecFFE
+dataconstructor http://www.gap-system.org/lib?listcoef?MultCoeffs
+dataconstructor http://www.gap-system.org/lib?listcoef?CoeffsMod
 theory http://www.gap-system.org/lib?listcoef
 HasMeta http://www.gap-system.org/lib?listcoef http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?listcoef http://www.gap-system.org/lib?list
diff --git a/relational/http..www.gap-system.org/lib/macfloat.rel b/relational/http..www.gap-system.org/lib/macfloat.rel
index bf3afd1396b2cbd7cc8ee66a9d8f34064b082a47..6471e02b6ee061aa63548fc500c80809a945a16a 100644
--- a/relational/http..www.gap-system.org/lib/macfloat.rel
+++ b/relational/http..www.gap-system.org/lib/macfloat.rel
@@ -13,6 +13,21 @@ implies http://www.gap-system.org/lib?macfloat?IsIEEE754FloatRep_st13 http://www
 implies http://www.gap-system.org/lib?macfloat?IsIEEE754FloatRep_st13 http://www.gap-system.org/lib?arith?IsZDFRE
 implies http://www.gap-system.org/lib?macfloat?IsIEEE754FloatRep_st13 http://www.gap-system.org/lib?arith?IsCommutativeElement
 implies http://www.gap-system.org/lib?macfloat?IsIEEE754FloatRep_st13 http://www.gap-system.org/lib?float?IsFloat
+dataconstructor http://www.gap-system.org/lib?macfloat?IsIEEE754FloatRep
+dataconstructor http://www.gap-system.org/lib?macfloat?IsIEEE754FloatRep_st0
+dataconstructor http://www.gap-system.org/lib?macfloat?IsIEEE754FloatRep_st1
+dataconstructor http://www.gap-system.org/lib?macfloat?IsIEEE754FloatRep_st2
+dataconstructor http://www.gap-system.org/lib?macfloat?IsIEEE754FloatRep_st3
+dataconstructor http://www.gap-system.org/lib?macfloat?IsIEEE754FloatRep_st4
+dataconstructor http://www.gap-system.org/lib?macfloat?IsIEEE754FloatRep_st5
+dataconstructor http://www.gap-system.org/lib?macfloat?IsIEEE754FloatRep_st6
+dataconstructor http://www.gap-system.org/lib?macfloat?IsIEEE754FloatRep_st7
+dataconstructor http://www.gap-system.org/lib?macfloat?IsIEEE754FloatRep_st8
+dataconstructor http://www.gap-system.org/lib?macfloat?IsIEEE754FloatRep_st9
+dataconstructor http://www.gap-system.org/lib?macfloat?IsIEEE754FloatRep_st10
+dataconstructor http://www.gap-system.org/lib?macfloat?IsIEEE754FloatRep_st11
+dataconstructor http://www.gap-system.org/lib?macfloat?IsIEEE754FloatRep_st12
+dataconstructor http://www.gap-system.org/lib?macfloat?IsIEEE754FloatRep_st13
 theory http://www.gap-system.org/lib?macfloat
 HasMeta http://www.gap-system.org/lib?macfloat http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?macfloat http://www.gap-system.org/lib?type
diff --git a/relational/http..www.gap-system.org/lib/magma.rel b/relational/http..www.gap-system.org/lib/magma.rel
index 659bb2fc9aff65225cf64243da9c8c905f0f0e2d..26b3ca1041f8e70f6affd4d16b369333af95fa76 100644
--- a/relational/http..www.gap-system.org/lib/magma.rel
+++ b/relational/http..www.gap-system.org/lib/magma.rel
@@ -87,6 +87,84 @@ implies http://www.gap-system.org/lib?magma?Centre http://www.gap-system.org/lib
 IsAttribute http://www.gap-system.org/lib?magma?SquareRoots
 implies http://www.gap-system.org/lib?magma?SquareRoots http://www.gap-system.org/lib?magma?IsMagma
 implies http://www.gap-system.org/lib?magma?SquareRoots http://www.gap-system.org/lib?arith?IsMultiplicativeElement
+dataconstructor http://www.gap-system.org/lib?magma?IsMagma
+dataconstructor http://www.gap-system.org/lib?magma?IsMagma_st0
+dataconstructor http://www.gap-system.org/lib?magma?IsMagma_st1
+dataconstructor http://www.gap-system.org/lib?magma?IsMagma_st2
+dataconstructor http://www.gap-system.org/lib?magma?IsMagma_st3
+dataconstructor http://www.gap-system.org/lib?magma?IsMagma_st4
+dataconstructor http://www.gap-system.org/lib?magma?IsMagma_st5
+dataconstructor http://www.gap-system.org/lib?magma?IsMagma_st6
+dataconstructor http://www.gap-system.org/lib?magma?IsMagma_st7
+dataconstructor http://www.gap-system.org/lib?magma?IsMagma_st8
+dataconstructor http://www.gap-system.org/lib?magma?IsMagma_st9
+dataconstructor http://www.gap-system.org/lib?magma?MultiplicativeNeutralElement
+dataconstructor http://www.gap-system.org/lib?magma?IsMagmaWithOne
+dataconstructor http://www.gap-system.org/lib?magma?IsMagmaWithOne_st0
+dataconstructor http://www.gap-system.org/lib?magma?IsMagmaWithOne_st1
+dataconstructor http://www.gap-system.org/lib?magma?IsMagmaWithOne_st2
+dataconstructor http://www.gap-system.org/lib?magma?IsMagmaWithOne_st3
+dataconstructor http://www.gap-system.org/lib?magma?IsMagmaWithOne_st4
+dataconstructor http://www.gap-system.org/lib?magma?IsMagmaWithOne_st5
+dataconstructor http://www.gap-system.org/lib?magma?IsMagmaWithOne_st6
+dataconstructor http://www.gap-system.org/lib?magma?IsMagmaWithOne_st7
+dataconstructor http://www.gap-system.org/lib?magma?IsMagmaWithOne_st8
+dataconstructor http://www.gap-system.org/lib?magma?IsMagmaWithOne_st9
+dataconstructor http://www.gap-system.org/lib?magma?IsMagmaWithOne_st10
+dataconstructor http://www.gap-system.org/lib?magma?IsMagmaWithOne_st11
+dataconstructor http://www.gap-system.org/lib?magma?IsMagmaWithOne_st12
+dataconstructor http://www.gap-system.org/lib?magma?IsMagmaWithInversesIfNonzero
+dataconstructor http://www.gap-system.org/lib?magma?IsMagmaWithInversesIfNonzero_st0
+dataconstructor http://www.gap-system.org/lib?magma?IsMagmaWithInversesIfNonzero_st1
+dataconstructor http://www.gap-system.org/lib?magma?IsMagmaWithInversesIfNonzero_st2
+dataconstructor http://www.gap-system.org/lib?magma?IsMagmaWithInversesIfNonzero_st3
+dataconstructor http://www.gap-system.org/lib?magma?IsMagmaWithInversesIfNonzero_st4
+dataconstructor http://www.gap-system.org/lib?magma?IsMagmaWithInversesIfNonzero_st5
+dataconstructor http://www.gap-system.org/lib?magma?IsMagmaWithInversesIfNonzero_st6
+dataconstructor http://www.gap-system.org/lib?magma?IsMagmaWithInversesIfNonzero_st7
+dataconstructor http://www.gap-system.org/lib?magma?IsMagmaWithInversesIfNonzero_st8
+dataconstructor http://www.gap-system.org/lib?magma?IsMagmaWithInversesIfNonzero_st9
+dataconstructor http://www.gap-system.org/lib?magma?IsMagmaWithInversesIfNonzero_st10
+dataconstructor http://www.gap-system.org/lib?magma?IsMagmaWithInversesIfNonzero_st11
+dataconstructor http://www.gap-system.org/lib?magma?IsMagmaWithInversesIfNonzero_st12
+dataconstructor http://www.gap-system.org/lib?magma?IsMagmaWithInversesIfNonzero_st13
+dataconstructor http://www.gap-system.org/lib?magma?IsMagmaWithInverses
+dataconstructor http://www.gap-system.org/lib?magma?IsMagmaWithInverses_st0
+dataconstructor http://www.gap-system.org/lib?magma?IsMagmaWithInverses_st1
+dataconstructor http://www.gap-system.org/lib?magma?IsMagmaWithInverses_st2
+dataconstructor http://www.gap-system.org/lib?magma?IsMagmaWithInverses_st3
+dataconstructor http://www.gap-system.org/lib?magma?IsMagmaWithInverses_st4
+dataconstructor http://www.gap-system.org/lib?magma?IsMagmaWithInverses_st5
+dataconstructor http://www.gap-system.org/lib?magma?IsMagmaWithInverses_st6
+dataconstructor http://www.gap-system.org/lib?magma?IsMagmaWithInverses_st7
+dataconstructor http://www.gap-system.org/lib?magma?IsMagmaWithInverses_st8
+dataconstructor http://www.gap-system.org/lib?magma?IsMagmaWithInverses_st9
+dataconstructor http://www.gap-system.org/lib?magma?IsMagmaWithInverses_st10
+dataconstructor http://www.gap-system.org/lib?magma?IsMagmaWithInverses_st11
+dataconstructor http://www.gap-system.org/lib?magma?IsMagmaWithInverses_st12
+dataconstructor http://www.gap-system.org/lib?magma?IsMagmaWithInverses_st13
+dataconstructor http://www.gap-system.org/lib?magma?IsMagmaWithInverses_st14
+dataconstructor http://www.gap-system.org/lib?magma?IsMagmaWithInverses_st15
+dataconstructor http://www.gap-system.org/lib?magma?IsAssociative
+dataconstructor http://www.gap-system.org/lib?magma?IsCommutative
+dataconstructor http://www.gap-system.org/lib?magma?IsCentral
+dataconstructor http://www.gap-system.org/lib?magma?GeneratorsOfMagmaWithInverses
+dataconstructor http://www.gap-system.org/lib?magma?AsSubmagma
+dataconstructor http://www.gap-system.org/lib?magma?AsMagma
+dataconstructor http://www.gap-system.org/lib?magma?CentralizerInParent
+dataconstructor http://www.gap-system.org/lib?magma?GeneratorsOfMagmaWithOne
+dataconstructor http://www.gap-system.org/lib?magma?CentralizerOp
+dataconstructor http://www.gap-system.org/lib?magma?IsGeneratorsOfMagmaWithInverses
+dataconstructor http://www.gap-system.org/lib?magma?TrivialSubmagmaWithOne
+dataconstructor http://www.gap-system.org/lib?magma?Centralizer
+dataconstructor http://www.gap-system.org/lib?magma?MagmaGeneratorsOfFamily
+dataconstructor http://www.gap-system.org/lib?magma?MagmaByGenerators
+dataconstructor http://www.gap-system.org/lib?magma?Idempotents
+dataconstructor http://www.gap-system.org/lib?magma?GeneratorsOfMagma
+dataconstructor http://www.gap-system.org/lib?magma?MagmaWithOneByGenerators
+dataconstructor http://www.gap-system.org/lib?magma?MagmaWithInversesByGenerators
+dataconstructor http://www.gap-system.org/lib?magma?Centre
+dataconstructor http://www.gap-system.org/lib?magma?SquareRoots
 theory http://www.gap-system.org/lib?magma
 HasMeta http://www.gap-system.org/lib?magma http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?magma http://www.gap-system.org/lib?coll
@@ -115,7 +193,6 @@ Declares http://www.gap-system.org/lib?magma http://www.gap-system.org/lib?magma
 constant http://www.gap-system.org/lib?magma?IsMagma_st8
 Declares http://www.gap-system.org/lib?magma http://www.gap-system.org/lib?magma?IsMagma_st9
 constant http://www.gap-system.org/lib?magma?IsMagma_st9
-Includes http://www.gap-system.org/lib?magma http://www.gap-system.org/lib?magma
 Declares http://www.gap-system.org/lib?magma http://www.gap-system.org/lib?magma?MultiplicativeNeutralElement
 constant http://www.gap-system.org/lib?magma?MultiplicativeNeutralElement
 Declares http://www.gap-system.org/lib?magma http://www.gap-system.org/lib?magma?IsMagmaWithOne
diff --git a/relational/http..www.gap-system.org/lib/mapphomo.rel b/relational/http..www.gap-system.org/lib/mapphomo.rel
index 006bd80cb1c3955875f3294382cd1b1e1ec66d6a..c71efb158f52a196fc62f81a65116062a034a174 100644
--- a/relational/http..www.gap-system.org/lib/mapphomo.rel
+++ b/relational/http..www.gap-system.org/lib/mapphomo.rel
@@ -146,6 +146,43 @@ implies http://www.gap-system.org/lib?mapphomo?IsAdditiveGroupHomomorphism http:
 implies http://www.gap-system.org/lib?mapphomo?IsAdditiveGroupHomomorphism http://www.gap-system.org/lib?mapping?IsSingleValued
 implies http://www.gap-system.org/lib?mapphomo?IsAdditiveGroupHomomorphism http://www.gap-system.org/lib?mapphomo?RespectsAddition
 implies http://www.gap-system.org/lib?mapphomo?IsAdditiveGroupHomomorphism http://www.gap-system.org/lib?mapphomo?RespectsAdditiveInverses
+dataconstructor http://www.gap-system.org/lib?mapphomo?RespectsMultiplication
+dataconstructor http://www.gap-system.org/lib?mapphomo?RespectsOne
+dataconstructor http://www.gap-system.org/lib?mapphomo?RespectsAddition
+dataconstructor http://www.gap-system.org/lib?mapphomo?RespectsAdditiveInverses
+dataconstructor http://www.gap-system.org/lib?mapphomo?IsRingWithOneHomomorphism
+dataconstructor http://www.gap-system.org/lib?mapphomo?RespectsInverses
+dataconstructor http://www.gap-system.org/lib?mapphomo?IsLinearMapping
+dataconstructor http://www.gap-system.org/lib?mapphomo?RespectsScalarMultiplication
+dataconstructor http://www.gap-system.org/lib?mapphomo?RespectsZero
+dataconstructor http://www.gap-system.org/lib?mapphomo?TransformsInversesIntoAdditiveInverses
+dataconstructor http://www.gap-system.org/lib?mapphomo?IsGroupHomomorphism
+dataconstructor http://www.gap-system.org/lib?mapphomo?TransformsMultiplicationIntoAddition
+dataconstructor http://www.gap-system.org/lib?mapphomo?TransformsAdditionIntoMultiplication
+dataconstructor http://www.gap-system.org/lib?mapphomo?TransformsAdditiveInversesIntoInverses
+dataconstructor http://www.gap-system.org/lib?mapphomo?IsAdditiveGroupToGroupGeneralMapping
+dataconstructor http://www.gap-system.org/lib?mapphomo?IsGroupToAdditiveGroupGeneralMapping
+dataconstructor http://www.gap-system.org/lib?mapphomo?CoKernelOfMultiplicativeGeneralMapping
+dataconstructor http://www.gap-system.org/lib?mapphomo?KernelOfAdditiveGeneralMapping
+dataconstructor http://www.gap-system.org/lib?mapphomo?IsFieldHomomorphism
+dataconstructor http://www.gap-system.org/lib?mapphomo?IsRingWithOneGeneralMapping
+dataconstructor http://www.gap-system.org/lib?mapphomo?IsAlgebraGeneralMapping
+dataconstructor http://www.gap-system.org/lib?mapphomo?IsRingHomomorphism
+dataconstructor http://www.gap-system.org/lib?mapphomo?TransformsZeroIntoOne
+dataconstructor http://www.gap-system.org/lib?mapphomo?IsRingGeneralMapping
+dataconstructor http://www.gap-system.org/lib?mapphomo?IsAdditiveGroupToGroupHomomorphism
+dataconstructor http://www.gap-system.org/lib?mapphomo?TranformsOneIntoZero
+dataconstructor http://www.gap-system.org/lib?mapphomo?IsAlgebraHomomorphism
+dataconstructor http://www.gap-system.org/lib?mapphomo?IsGroupToAdditiveGroupHomomorphism
+dataconstructor http://www.gap-system.org/lib?mapphomo?KernelOfMultiplicativeGeneralMapping
+dataconstructor http://www.gap-system.org/lib?mapphomo?IsAlgebraWithOneGeneralMapping
+dataconstructor http://www.gap-system.org/lib?mapphomo?IsLeftModuleHomomorphism
+dataconstructor http://www.gap-system.org/lib?mapphomo?IsGroupGeneralMapping
+dataconstructor http://www.gap-system.org/lib?mapphomo?IsAlgebraWithOneHomomorphism
+dataconstructor http://www.gap-system.org/lib?mapphomo?IsLeftModuleGeneralMapping
+dataconstructor http://www.gap-system.org/lib?mapphomo?IsAdditiveGroupGeneralMapping
+dataconstructor http://www.gap-system.org/lib?mapphomo?CoKernelOfAdditiveGeneralMapping
+dataconstructor http://www.gap-system.org/lib?mapphomo?IsAdditiveGroupHomomorphism
 theory http://www.gap-system.org/lib?mapphomo
 HasMeta http://www.gap-system.org/lib?mapphomo http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?mapphomo http://www.gap-system.org/lib?mapping
@@ -157,7 +194,6 @@ Declares http://www.gap-system.org/lib?mapphomo http://www.gap-system.org/lib?ma
 constant http://www.gap-system.org/lib?mapphomo?RespectsAddition
 Declares http://www.gap-system.org/lib?mapphomo http://www.gap-system.org/lib?mapphomo?RespectsAdditiveInverses
 constant http://www.gap-system.org/lib?mapphomo?RespectsAdditiveInverses
-Includes http://www.gap-system.org/lib?mapphomo http://www.gap-system.org/lib?mapphomo
 Declares http://www.gap-system.org/lib?mapphomo http://www.gap-system.org/lib?mapphomo?IsRingWithOneHomomorphism
 constant http://www.gap-system.org/lib?mapphomo?IsRingWithOneHomomorphism
 Declares http://www.gap-system.org/lib?mapphomo http://www.gap-system.org/lib?mapphomo?RespectsInverses
diff --git a/relational/http..www.gap-system.org/lib/mapping.rel b/relational/http..www.gap-system.org/lib/mapping.rel
index 47301d7155fae35027dcf319cb4766ad7ed719e7..f7deab76a294050092886e1559623119e76ce96f 100644
--- a/relational/http..www.gap-system.org/lib/mapping.rel
+++ b/relational/http..www.gap-system.org/lib/mapping.rel
@@ -127,6 +127,83 @@ IsAttribute http://www.gap-system.org/lib?mapping?ImageElm
 implies http://www.gap-system.org/lib?mapping?ImageElm http://www.gap-system.org/lib?mapping?IsGeneralMapping
 implies http://www.gap-system.org/lib?mapping?ImageElm http://www.gap-system.org/lib?mapping?IsTotal
 implies http://www.gap-system.org/lib?mapping?ImageElm http://www.gap-system.org/lib?mapping?IsSingleValued
+dataconstructor http://www.gap-system.org/lib?mapping?IsGeneralMapping
+dataconstructor http://www.gap-system.org/lib?mapping?IsGeneralMapping_st0
+dataconstructor http://www.gap-system.org/lib?mapping?IsGeneralMapping_st1
+dataconstructor http://www.gap-system.org/lib?mapping?IsGeneralMapping_st2
+dataconstructor http://www.gap-system.org/lib?mapping?IsGeneralMapping_st3
+dataconstructor http://www.gap-system.org/lib?mapping?IsGeneralMapping_st4
+dataconstructor http://www.gap-system.org/lib?mapping?IsGeneralMapping_st5
+dataconstructor http://www.gap-system.org/lib?mapping?IsTotal
+dataconstructor http://www.gap-system.org/lib?mapping?IsSingleValued
+dataconstructor http://www.gap-system.org/lib?mapping?IsSPGeneralMapping
+dataconstructor http://www.gap-system.org/lib?mapping?IsSPGeneralMapping_st0
+dataconstructor http://www.gap-system.org/lib?mapping?IsSPGeneralMapping_st1
+dataconstructor http://www.gap-system.org/lib?mapping?IsSPGeneralMapping_st2
+dataconstructor http://www.gap-system.org/lib?mapping?IsSPGeneralMapping_st3
+dataconstructor http://www.gap-system.org/lib?mapping?IsSPGeneralMapping_st4
+dataconstructor http://www.gap-system.org/lib?mapping?IsSPGeneralMapping_st5
+dataconstructor http://www.gap-system.org/lib?mapping?IsSPGeneralMapping_st6
+dataconstructor http://www.gap-system.org/lib?mapping?IsEndoGeneralMapping
+dataconstructor http://www.gap-system.org/lib?mapping?PreImagesRepresentative
+dataconstructor http://www.gap-system.org/lib?mapping?PreImagesElm
+dataconstructor http://www.gap-system.org/lib?mapping?IsGeneralRestrictedMappingRep
+dataconstructor http://www.gap-system.org/lib?mapping?IsGeneralRestrictedMappingRep_st0
+dataconstructor http://www.gap-system.org/lib?mapping?IsGeneralRestrictedMappingRep_st1
+dataconstructor http://www.gap-system.org/lib?mapping?IsGeneralRestrictedMappingRep_st2
+dataconstructor http://www.gap-system.org/lib?mapping?IsGeneralRestrictedMappingRep_st3
+dataconstructor http://www.gap-system.org/lib?mapping?IsGeneralRestrictedMappingRep_st4
+dataconstructor http://www.gap-system.org/lib?mapping?IsGeneralRestrictedMappingRep_st5
+dataconstructor http://www.gap-system.org/lib?mapping?IsGeneralRestrictedMappingRep_st6
+dataconstructor http://www.gap-system.org/lib?mapping?IsGeneralRestrictedMappingRep_st7
+dataconstructor http://www.gap-system.org/lib?mapping?IsGeneralRestrictedMappingRep_st8
+dataconstructor http://www.gap-system.org/lib?mapping?IsNonSPGeneralMapping
+dataconstructor http://www.gap-system.org/lib?mapping?IsNonSPGeneralMapping_st0
+dataconstructor http://www.gap-system.org/lib?mapping?IsNonSPGeneralMapping_st1
+dataconstructor http://www.gap-system.org/lib?mapping?IsNonSPGeneralMapping_st2
+dataconstructor http://www.gap-system.org/lib?mapping?IsNonSPGeneralMapping_st3
+dataconstructor http://www.gap-system.org/lib?mapping?IsNonSPGeneralMapping_st4
+dataconstructor http://www.gap-system.org/lib?mapping?IsNonSPGeneralMapping_st5
+dataconstructor http://www.gap-system.org/lib?mapping?IsNonSPGeneralMapping_st6
+dataconstructor http://www.gap-system.org/lib?mapping?FamilyRange
+dataconstructor http://www.gap-system.org/lib?mapping?Range
+dataconstructor http://www.gap-system.org/lib?mapping?FamiliesOfGeneralMappingsAndRanges
+dataconstructor http://www.gap-system.org/lib?mapping?IsInjective
+dataconstructor http://www.gap-system.org/lib?mapping?IsSurjective
+dataconstructor http://www.gap-system.org/lib?mapping?FamilySource
+dataconstructor http://www.gap-system.org/lib?mapping?ImagesElm
+dataconstructor http://www.gap-system.org/lib?mapping?ImagesSet
+dataconstructor http://www.gap-system.org/lib?mapping?IsEndoMapping
+dataconstructor http://www.gap-system.org/lib?mapping?IsMapping
+dataconstructor http://www.gap-system.org/lib?mapping?UnderlyingRelation
+dataconstructor http://www.gap-system.org/lib?mapping?MappingGeneratorsImages
+dataconstructor http://www.gap-system.org/lib?mapping?Source
+dataconstructor http://www.gap-system.org/lib?mapping?ImagesSource
+dataconstructor http://www.gap-system.org/lib?mapping?IdentityMapping
+dataconstructor http://www.gap-system.org/lib?mapping?InverseGeneralMapping
+dataconstructor http://www.gap-system.org/lib?mapping?Projection
+dataconstructor http://www.gap-system.org/lib?mapping?ImagesRepresentative
+dataconstructor http://www.gap-system.org/lib?mapping?CompositionMapping2
+dataconstructor http://www.gap-system.org/lib?mapping?PreImagesSet
+dataconstructor http://www.gap-system.org/lib?mapping?IsConstantTimeAccessGeneralMapping
+dataconstructor http://www.gap-system.org/lib?mapping?UnderlyingGeneralMapping
+dataconstructor http://www.gap-system.org/lib?mapping?RestrictedMapping
+dataconstructor http://www.gap-system.org/lib?mapping?ZeroMapping
+dataconstructor http://www.gap-system.org/lib?mapping?IsBijective
+dataconstructor http://www.gap-system.org/lib?mapping?IsCompositionMappingRep
+dataconstructor http://www.gap-system.org/lib?mapping?IsCompositionMappingRep_st0
+dataconstructor http://www.gap-system.org/lib?mapping?IsCompositionMappingRep_st1
+dataconstructor http://www.gap-system.org/lib?mapping?IsCompositionMappingRep_st2
+dataconstructor http://www.gap-system.org/lib?mapping?IsCompositionMappingRep_st3
+dataconstructor http://www.gap-system.org/lib?mapping?IsCompositionMappingRep_st4
+dataconstructor http://www.gap-system.org/lib?mapping?IsCompositionMappingRep_st5
+dataconstructor http://www.gap-system.org/lib?mapping?IsCompositionMappingRep_st6
+dataconstructor http://www.gap-system.org/lib?mapping?IsCompositionMappingRep_st7
+dataconstructor http://www.gap-system.org/lib?mapping?IsCompositionMappingRep_st8
+dataconstructor http://www.gap-system.org/lib?mapping?PreImagesRange
+dataconstructor http://www.gap-system.org/lib?mapping?PreImageElm
+dataconstructor http://www.gap-system.org/lib?mapping?Embedding
+dataconstructor http://www.gap-system.org/lib?mapping?ImageElm
 theory http://www.gap-system.org/lib?mapping
 HasMeta http://www.gap-system.org/lib?mapping http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?mapping http://www.gap-system.org/lib?arith
@@ -144,7 +221,6 @@ Declares http://www.gap-system.org/lib?mapping http://www.gap-system.org/lib?map
 constant http://www.gap-system.org/lib?mapping?IsGeneralMapping_st4
 Declares http://www.gap-system.org/lib?mapping http://www.gap-system.org/lib?mapping?IsGeneralMapping_st5
 constant http://www.gap-system.org/lib?mapping?IsGeneralMapping_st5
-Includes http://www.gap-system.org/lib?mapping http://www.gap-system.org/lib?mapping
 Declares http://www.gap-system.org/lib?mapping http://www.gap-system.org/lib?mapping?IsTotal
 constant http://www.gap-system.org/lib?mapping?IsTotal
 Declares http://www.gap-system.org/lib?mapping http://www.gap-system.org/lib?mapping?IsSingleValued
diff --git a/relational/http..www.gap-system.org/lib/mapprep.rel b/relational/http..www.gap-system.org/lib/mapprep.rel
index 1b40edfbbb86ad38b5f9bcd1bc2168a61d049981..83556c3d8b04bb12a0db4d6014179323b250de23 100644
--- a/relational/http..www.gap-system.org/lib/mapprep.rel
+++ b/relational/http..www.gap-system.org/lib/mapprep.rel
@@ -108,6 +108,134 @@ implies http://www.gap-system.org/lib?mapprep?IsInverseGeneralMappingRep_st7 htt
 implies http://www.gap-system.org/lib?mapprep?IsInverseGeneralMappingRep_st7 http://www.gap-system.org/lib?arith?IsAssociativeElement
 implies http://www.gap-system.org/lib?mapprep?IsInverseGeneralMappingRep_st7 http://www.gap-system.org/lib?mapping?IsGeneralMapping
 implies http://www.gap-system.org/lib?mapprep?IsInverseGeneralMappingRep_st7 http://www.gap-system.org/lib?mapping?IsNonSPGeneralMapping
+dataconstructor http://www.gap-system.org/lib?mapprep?IsMappingByFunctionRep
+dataconstructor http://www.gap-system.org/lib?mapprep?IsMappingByFunctionRep_st0
+dataconstructor http://www.gap-system.org/lib?mapprep?IsMappingByFunctionRep_st1
+dataconstructor http://www.gap-system.org/lib?mapprep?IsMappingByFunctionRep_st2
+dataconstructor http://www.gap-system.org/lib?mapprep?IsMappingByFunctionRep_st3
+dataconstructor http://www.gap-system.org/lib?mapprep?IsMappingByFunctionRep_st4
+dataconstructor http://www.gap-system.org/lib?mapprep?IsMappingByFunctionRep_st5
+dataconstructor http://www.gap-system.org/lib?mapprep?IsMappingByFunctionRep_st6
+dataconstructor http://www.gap-system.org/lib?mapprep?IsMappingByFunctionRep_st7
+dataconstructor http://www.gap-system.org/lib?mapprep?IsMappingByFunctionRep_st8
+dataconstructor http://www.gap-system.org/lib?mapprep?IsMappingByFunctionRep_st9
+dataconstructor http://www.gap-system.org/lib?mapprep?IsMappingByFunctionRep_st10
+dataconstructor http://www.gap-system.org/lib?mapprep?IsMappingByFunctionRep_st11
+dataconstructor http://www.gap-system.org/lib?mapprep?IsMappingByFunctionRep_st12
+dataconstructor http://www.gap-system.org/lib?mapprep?IsSPMappingByFunctionRep
+dataconstructor http://www.gap-system.org/lib?mapprep?IsSPMappingByFunctionRep_st0
+dataconstructor http://www.gap-system.org/lib?mapprep?IsSPMappingByFunctionRep_st1
+dataconstructor http://www.gap-system.org/lib?mapprep?IsSPMappingByFunctionRep_st2
+dataconstructor http://www.gap-system.org/lib?mapprep?IsSPMappingByFunctionRep_st3
+dataconstructor http://www.gap-system.org/lib?mapprep?IsSPMappingByFunctionRep_st4
+dataconstructor http://www.gap-system.org/lib?mapprep?IsSPMappingByFunctionRep_st5
+dataconstructor http://www.gap-system.org/lib?mapprep?IsSPMappingByFunctionRep_st6
+dataconstructor http://www.gap-system.org/lib?mapprep?IsSPMappingByFunctionRep_st7
+dataconstructor http://www.gap-system.org/lib?mapprep?IsSPMappingByFunctionRep_st8
+dataconstructor http://www.gap-system.org/lib?mapprep?IsSPMappingByFunctionRep_st9
+dataconstructor http://www.gap-system.org/lib?mapprep?IsSPMappingByFunctionRep_st10
+dataconstructor http://www.gap-system.org/lib?mapprep?IsSPMappingByFunctionRep_st11
+dataconstructor http://www.gap-system.org/lib?mapprep?IsSPMappingByFunctionRep_st12
+dataconstructor http://www.gap-system.org/lib?mapprep?IsSPMappingByFunctionRep_st13
+dataconstructor http://www.gap-system.org/lib?mapprep?IsSPMappingByFunctionRep_st14
+dataconstructor http://www.gap-system.org/lib?mapprep?IsDefaultGeneralMappingRep
+dataconstructor http://www.gap-system.org/lib?mapprep?IsDefaultGeneralMappingRep_st0
+dataconstructor http://www.gap-system.org/lib?mapprep?IsDefaultGeneralMappingRep_st1
+dataconstructor http://www.gap-system.org/lib?mapprep?IsDefaultGeneralMappingRep_st2
+dataconstructor http://www.gap-system.org/lib?mapprep?IsDefaultGeneralMappingRep_st3
+dataconstructor http://www.gap-system.org/lib?mapprep?IsDefaultGeneralMappingRep_st4
+dataconstructor http://www.gap-system.org/lib?mapprep?IsDefaultGeneralMappingRep_st5
+dataconstructor http://www.gap-system.org/lib?mapprep?IsDefaultGeneralMappingRep_st6
+dataconstructor http://www.gap-system.org/lib?mapprep?IsDefaultGeneralMappingRep_st7
+dataconstructor http://www.gap-system.org/lib?mapprep?IsDefaultGeneralMappingRep_st8
+dataconstructor http://www.gap-system.org/lib?mapprep?IsMappingByFunctionWithInverseRep
+dataconstructor http://www.gap-system.org/lib?mapprep?IsMappingByFunctionWithInverseRep_st0
+dataconstructor http://www.gap-system.org/lib?mapprep?IsMappingByFunctionWithInverseRep_st1
+dataconstructor http://www.gap-system.org/lib?mapprep?IsMappingByFunctionWithInverseRep_st2
+dataconstructor http://www.gap-system.org/lib?mapprep?IsMappingByFunctionWithInverseRep_st3
+dataconstructor http://www.gap-system.org/lib?mapprep?IsMappingByFunctionWithInverseRep_st4
+dataconstructor http://www.gap-system.org/lib?mapprep?IsMappingByFunctionWithInverseRep_st5
+dataconstructor http://www.gap-system.org/lib?mapprep?IsMappingByFunctionWithInverseRep_st6
+dataconstructor http://www.gap-system.org/lib?mapprep?IsMappingByFunctionWithInverseRep_st7
+dataconstructor http://www.gap-system.org/lib?mapprep?IsMappingByFunctionWithInverseRep_st8
+dataconstructor http://www.gap-system.org/lib?mapprep?IsMappingByFunctionWithInverseRep_st9
+dataconstructor http://www.gap-system.org/lib?mapprep?IsMappingByFunctionWithInverseRep_st10
+dataconstructor http://www.gap-system.org/lib?mapprep?IsMappingByFunctionWithInverseRep_st11
+dataconstructor http://www.gap-system.org/lib?mapprep?IsMappingByFunctionWithInverseRep_st12
+dataconstructor http://www.gap-system.org/lib?mapprep?IsMappingByFunctionWithInverseRep_st13
+dataconstructor http://www.gap-system.org/lib?mapprep?IsMappingByFunctionWithInverseRep_st14
+dataconstructor http://www.gap-system.org/lib?mapprep?IsMappingByFunctionWithInverseRep_st15
+dataconstructor http://www.gap-system.org/lib?mapprep?IsMappingByFunctionWithInverseRep_st16
+dataconstructor http://www.gap-system.org/lib?mapprep?IsMappingByFunctionWithInverseRep_st17
+dataconstructor http://www.gap-system.org/lib?mapprep?IsSPMappingByFunctionWithInverseRep
+dataconstructor http://www.gap-system.org/lib?mapprep?IsSPMappingByFunctionWithInverseRep_st0
+dataconstructor http://www.gap-system.org/lib?mapprep?IsSPMappingByFunctionWithInverseRep_st1
+dataconstructor http://www.gap-system.org/lib?mapprep?IsSPMappingByFunctionWithInverseRep_st2
+dataconstructor http://www.gap-system.org/lib?mapprep?IsSPMappingByFunctionWithInverseRep_st3
+dataconstructor http://www.gap-system.org/lib?mapprep?IsSPMappingByFunctionWithInverseRep_st4
+dataconstructor http://www.gap-system.org/lib?mapprep?IsSPMappingByFunctionWithInverseRep_st5
+dataconstructor http://www.gap-system.org/lib?mapprep?IsSPMappingByFunctionWithInverseRep_st6
+dataconstructor http://www.gap-system.org/lib?mapprep?IsSPMappingByFunctionWithInverseRep_st7
+dataconstructor http://www.gap-system.org/lib?mapprep?IsSPMappingByFunctionWithInverseRep_st8
+dataconstructor http://www.gap-system.org/lib?mapprep?IsSPMappingByFunctionWithInverseRep_st9
+dataconstructor http://www.gap-system.org/lib?mapprep?IsSPMappingByFunctionWithInverseRep_st10
+dataconstructor http://www.gap-system.org/lib?mapprep?IsSPMappingByFunctionWithInverseRep_st11
+dataconstructor http://www.gap-system.org/lib?mapprep?IsSPMappingByFunctionWithInverseRep_st12
+dataconstructor http://www.gap-system.org/lib?mapprep?IsSPMappingByFunctionWithInverseRep_st13
+dataconstructor http://www.gap-system.org/lib?mapprep?IsSPMappingByFunctionWithInverseRep_st14
+dataconstructor http://www.gap-system.org/lib?mapprep?IsSPMappingByFunctionWithInverseRep_st15
+dataconstructor http://www.gap-system.org/lib?mapprep?IsSPMappingByFunctionWithInverseRep_st16
+dataconstructor http://www.gap-system.org/lib?mapprep?IsSPMappingByFunctionWithInverseRep_st17
+dataconstructor http://www.gap-system.org/lib?mapprep?IsSPMappingByFunctionWithInverseRep_st18
+dataconstructor http://www.gap-system.org/lib?mapprep?IsSPMappingByFunctionWithInverseRep_st19
+dataconstructor http://www.gap-system.org/lib?mapprep?IsSPMappingByFunctionWithInverseRep_st20
+dataconstructor http://www.gap-system.org/lib?mapprep?IsNonSPMappingByFunctionRep
+dataconstructor http://www.gap-system.org/lib?mapprep?IsNonSPMappingByFunctionRep_st0
+dataconstructor http://www.gap-system.org/lib?mapprep?IsNonSPMappingByFunctionRep_st1
+dataconstructor http://www.gap-system.org/lib?mapprep?IsNonSPMappingByFunctionRep_st2
+dataconstructor http://www.gap-system.org/lib?mapprep?IsNonSPMappingByFunctionRep_st3
+dataconstructor http://www.gap-system.org/lib?mapprep?IsNonSPMappingByFunctionRep_st4
+dataconstructor http://www.gap-system.org/lib?mapprep?IsNonSPMappingByFunctionRep_st5
+dataconstructor http://www.gap-system.org/lib?mapprep?IsNonSPMappingByFunctionRep_st6
+dataconstructor http://www.gap-system.org/lib?mapprep?IsNonSPMappingByFunctionRep_st7
+dataconstructor http://www.gap-system.org/lib?mapprep?IsNonSPMappingByFunctionRep_st8
+dataconstructor http://www.gap-system.org/lib?mapprep?IsNonSPMappingByFunctionRep_st9
+dataconstructor http://www.gap-system.org/lib?mapprep?IsNonSPMappingByFunctionRep_st10
+dataconstructor http://www.gap-system.org/lib?mapprep?IsNonSPMappingByFunctionRep_st11
+dataconstructor http://www.gap-system.org/lib?mapprep?IsNonSPMappingByFunctionRep_st12
+dataconstructor http://www.gap-system.org/lib?mapprep?IsNonSPMappingByFunctionRep_st13
+dataconstructor http://www.gap-system.org/lib?mapprep?IsNonSPMappingByFunctionRep_st14
+dataconstructor http://www.gap-system.org/lib?mapprep?IsNonSPMappingByFunctionWithInverseRep
+dataconstructor http://www.gap-system.org/lib?mapprep?IsNonSPMappingByFunctionWithInverseRep_st0
+dataconstructor http://www.gap-system.org/lib?mapprep?IsNonSPMappingByFunctionWithInverseRep_st1
+dataconstructor http://www.gap-system.org/lib?mapprep?IsNonSPMappingByFunctionWithInverseRep_st2
+dataconstructor http://www.gap-system.org/lib?mapprep?IsNonSPMappingByFunctionWithInverseRep_st3
+dataconstructor http://www.gap-system.org/lib?mapprep?IsNonSPMappingByFunctionWithInverseRep_st4
+dataconstructor http://www.gap-system.org/lib?mapprep?IsNonSPMappingByFunctionWithInverseRep_st5
+dataconstructor http://www.gap-system.org/lib?mapprep?IsNonSPMappingByFunctionWithInverseRep_st6
+dataconstructor http://www.gap-system.org/lib?mapprep?IsNonSPMappingByFunctionWithInverseRep_st7
+dataconstructor http://www.gap-system.org/lib?mapprep?IsNonSPMappingByFunctionWithInverseRep_st8
+dataconstructor http://www.gap-system.org/lib?mapprep?IsNonSPMappingByFunctionWithInverseRep_st9
+dataconstructor http://www.gap-system.org/lib?mapprep?IsNonSPMappingByFunctionWithInverseRep_st10
+dataconstructor http://www.gap-system.org/lib?mapprep?IsNonSPMappingByFunctionWithInverseRep_st11
+dataconstructor http://www.gap-system.org/lib?mapprep?IsNonSPMappingByFunctionWithInverseRep_st12
+dataconstructor http://www.gap-system.org/lib?mapprep?IsNonSPMappingByFunctionWithInverseRep_st13
+dataconstructor http://www.gap-system.org/lib?mapprep?IsNonSPMappingByFunctionWithInverseRep_st14
+dataconstructor http://www.gap-system.org/lib?mapprep?IsNonSPMappingByFunctionWithInverseRep_st15
+dataconstructor http://www.gap-system.org/lib?mapprep?IsNonSPMappingByFunctionWithInverseRep_st16
+dataconstructor http://www.gap-system.org/lib?mapprep?IsNonSPMappingByFunctionWithInverseRep_st17
+dataconstructor http://www.gap-system.org/lib?mapprep?IsNonSPMappingByFunctionWithInverseRep_st18
+dataconstructor http://www.gap-system.org/lib?mapprep?IsNonSPMappingByFunctionWithInverseRep_st19
+dataconstructor http://www.gap-system.org/lib?mapprep?IsNonSPMappingByFunctionWithInverseRep_st20
+dataconstructor http://www.gap-system.org/lib?mapprep?IsInverseGeneralMappingRep
+dataconstructor http://www.gap-system.org/lib?mapprep?IsInverseGeneralMappingRep_st0
+dataconstructor http://www.gap-system.org/lib?mapprep?IsInverseGeneralMappingRep_st1
+dataconstructor http://www.gap-system.org/lib?mapprep?IsInverseGeneralMappingRep_st2
+dataconstructor http://www.gap-system.org/lib?mapprep?IsInverseGeneralMappingRep_st3
+dataconstructor http://www.gap-system.org/lib?mapprep?IsInverseGeneralMappingRep_st4
+dataconstructor http://www.gap-system.org/lib?mapprep?IsInverseGeneralMappingRep_st5
+dataconstructor http://www.gap-system.org/lib?mapprep?IsInverseGeneralMappingRep_st6
+dataconstructor http://www.gap-system.org/lib?mapprep?IsInverseGeneralMappingRep_st7
 theory http://www.gap-system.org/lib?mapprep
 HasMeta http://www.gap-system.org/lib?mapprep http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?mapprep http://www.gap-system.org/lib?type
@@ -141,7 +269,6 @@ Declares http://www.gap-system.org/lib?mapprep http://www.gap-system.org/lib?map
 constant http://www.gap-system.org/lib?mapprep?IsMappingByFunctionRep_st11
 Declares http://www.gap-system.org/lib?mapprep http://www.gap-system.org/lib?mapprep?IsMappingByFunctionRep_st12
 constant http://www.gap-system.org/lib?mapprep?IsMappingByFunctionRep_st12
-Includes http://www.gap-system.org/lib?mapprep http://www.gap-system.org/lib?mapprep
 Declares http://www.gap-system.org/lib?mapprep http://www.gap-system.org/lib?mapprep?IsSPMappingByFunctionRep
 constant http://www.gap-system.org/lib?mapprep?IsSPMappingByFunctionRep
 Declares http://www.gap-system.org/lib?mapprep http://www.gap-system.org/lib?mapprep?IsSPMappingByFunctionRep_st0
diff --git a/relational/http..www.gap-system.org/lib/mat8bit.rel b/relational/http..www.gap-system.org/lib/mat8bit.rel
index bc8611c36d772ec552f647bba7f6db9a07614b76..0797876d9f52040956598669ab114279e108b6da 100644
--- a/relational/http..www.gap-system.org/lib/mat8bit.rel
+++ b/relational/http..www.gap-system.org/lib/mat8bit.rel
@@ -13,6 +13,21 @@ implies http://www.gap-system.org/lib?mat8bit?Is8BitMatrixRep_st13 http://www.ga
 implies http://www.gap-system.org/lib?mat8bit?Is8BitMatrixRep_st13 http://www.gap-system.org/lib?arith?IsMultiplicativeElementWithInverse
 implies http://www.gap-system.org/lib?mat8bit?Is8BitMatrixRep_st13 http://www.gap-system.org/lib?matobj1?IsMatrixObj
 implies http://www.gap-system.org/lib?mat8bit?Is8BitMatrixRep_st13 http://www.gap-system.org/lib?matobj1?IsRowListMatrix
+dataconstructor http://www.gap-system.org/lib?mat8bit?Is8BitMatrixRep
+dataconstructor http://www.gap-system.org/lib?mat8bit?Is8BitMatrixRep_st0
+dataconstructor http://www.gap-system.org/lib?mat8bit?Is8BitMatrixRep_st1
+dataconstructor http://www.gap-system.org/lib?mat8bit?Is8BitMatrixRep_st2
+dataconstructor http://www.gap-system.org/lib?mat8bit?Is8BitMatrixRep_st3
+dataconstructor http://www.gap-system.org/lib?mat8bit?Is8BitMatrixRep_st4
+dataconstructor http://www.gap-system.org/lib?mat8bit?Is8BitMatrixRep_st5
+dataconstructor http://www.gap-system.org/lib?mat8bit?Is8BitMatrixRep_st6
+dataconstructor http://www.gap-system.org/lib?mat8bit?Is8BitMatrixRep_st7
+dataconstructor http://www.gap-system.org/lib?mat8bit?Is8BitMatrixRep_st8
+dataconstructor http://www.gap-system.org/lib?mat8bit?Is8BitMatrixRep_st9
+dataconstructor http://www.gap-system.org/lib?mat8bit?Is8BitMatrixRep_st10
+dataconstructor http://www.gap-system.org/lib?mat8bit?Is8BitMatrixRep_st11
+dataconstructor http://www.gap-system.org/lib?mat8bit?Is8BitMatrixRep_st12
+dataconstructor http://www.gap-system.org/lib?mat8bit?Is8BitMatrixRep_st13
 theory http://www.gap-system.org/lib?mat8bit
 HasMeta http://www.gap-system.org/lib?mat8bit http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?mat8bit http://www.gap-system.org/lib?object
diff --git a/relational/http..www.gap-system.org/lib/matblock.rel b/relational/http..www.gap-system.org/lib/matblock.rel
index 50d529ffcf2d509e541f9cc31d5e0be08b254a76..f3535e949070148dfec6fa983adef59825496f62 100644
--- a/relational/http..www.gap-system.org/lib/matblock.rel
+++ b/relational/http..www.gap-system.org/lib/matblock.rel
@@ -5,6 +5,9 @@ implies http://www.gap-system.org/lib?matblock?MatrixByBlockMatrix http://www.ga
 implies http://www.gap-system.org/lib?matblock?MatrixByBlockMatrix http://www.gap-system.org/lib?arith?IsNearAdditiveElementWithInverse
 implies http://www.gap-system.org/lib?matblock?MatrixByBlockMatrix http://www.gap-system.org/lib?arith?IsAdditiveElement
 implies http://www.gap-system.org/lib?matblock?MatrixByBlockMatrix http://www.gap-system.org/lib?arith?IsMultiplicativeElement
+dataconstructor http://www.gap-system.org/lib?matblock?IsBlockMatrixRep
+dataconstructor http://www.gap-system.org/lib?matblock?IsBlockMatrixRep_st0
+dataconstructor http://www.gap-system.org/lib?matblock?MatrixByBlockMatrix
 theory http://www.gap-system.org/lib?matblock
 HasMeta http://www.gap-system.org/lib?matblock http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?matblock http://www.gap-system.org/lib?type
diff --git a/relational/http..www.gap-system.org/lib/matint.rel b/relational/http..www.gap-system.org/lib/matint.rel
index 4e48fa672eb695a54f659868697cca862baa43c9..535ef726ec92eaa7fad9a72bd8781f425d383d93 100644
--- a/relational/http..www.gap-system.org/lib/matint.rel
+++ b/relational/http..www.gap-system.org/lib/matint.rel
@@ -73,6 +73,20 @@ implies http://www.gap-system.org/lib?matint?SolutionIntMat http://www.gap-syste
 implies http://www.gap-system.org/lib?matint?SolutionIntMat http://www.gap-system.org/lib?arith?IsMultiplicativeElement
 implies http://www.gap-system.org/lib?matint?SolutionIntMat http://www.gap-system.org/lib?cyclotom?IsCyclotomic
 implies http://www.gap-system.org/lib?matint?SolutionIntMat http://www.gap-system.org/lib?list?IsList
+dataconstructor http://www.gap-system.org/lib?matint?TriangulizeIntegerMat
+dataconstructor http://www.gap-system.org/lib?matint?TriangulizedIntegerMat
+dataconstructor http://www.gap-system.org/lib?matint?BaseIntMat
+dataconstructor http://www.gap-system.org/lib?matint?NullspaceIntMat
+dataconstructor http://www.gap-system.org/lib?matint?TriangulizedIntegerMatTransform
+dataconstructor http://www.gap-system.org/lib?matint?SolutionNullspaceIntMat
+dataconstructor http://www.gap-system.org/lib?matint?HermiteNormalFormIntegerMat
+dataconstructor http://www.gap-system.org/lib?matint?BaseIntersectionIntMats
+dataconstructor http://www.gap-system.org/lib?matint?HermiteNormalFormIntegerMatTransform
+dataconstructor http://www.gap-system.org/lib?matint?SmithNormalFormIntegerMat
+dataconstructor http://www.gap-system.org/lib?matint?SmithNormalFormIntegerMatTransforms
+dataconstructor http://www.gap-system.org/lib?matint?AbelianInvariantsOfList
+dataconstructor http://www.gap-system.org/lib?matint?ComplementIntMat
+dataconstructor http://www.gap-system.org/lib?matint?SolutionIntMat
 theory http://www.gap-system.org/lib?matint
 HasMeta http://www.gap-system.org/lib?matint http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?matint http://www.gap-system.org/lib?list
diff --git a/relational/http..www.gap-system.org/lib/matobj1.rel b/relational/http..www.gap-system.org/lib/matobj1.rel
index 22a2c41f9cef0c0667bbc37efc6e697ca46f3579..31cabb3909706dd6e1673ba9f42eeef6f9a2cadd 100644
--- a/relational/http..www.gap-system.org/lib/matobj1.rel
+++ b/relational/http..www.gap-system.org/lib/matobj1.rel
@@ -45,6 +45,53 @@ implies http://www.gap-system.org/lib?matobj1?IsFlatMatrix_st11 http://www.gap-s
 implies http://www.gap-system.org/lib?matobj1?IsFlatMatrix_st11 http://www.gap-system.org/lib?arith?IsMultiplicativeElementWithOne
 implies http://www.gap-system.org/lib?matobj1?IsFlatMatrix_st11 http://www.gap-system.org/lib?arith?IsMultiplicativeElementWithInverse
 implies http://www.gap-system.org/lib?matobj1?IsFlatMatrix_st11 http://www.gap-system.org/lib?matobj1?IsMatrixObj
+dataconstructor http://www.gap-system.org/lib?matobj1?IsMatrixObj
+dataconstructor http://www.gap-system.org/lib?matobj1?IsMatrixObj_st0
+dataconstructor http://www.gap-system.org/lib?matobj1?IsMatrixObj_st1
+dataconstructor http://www.gap-system.org/lib?matobj1?IsMatrixObj_st2
+dataconstructor http://www.gap-system.org/lib?matobj1?IsMatrixObj_st3
+dataconstructor http://www.gap-system.org/lib?matobj1?IsMatrixObj_st4
+dataconstructor http://www.gap-system.org/lib?matobj1?IsMatrixObj_st5
+dataconstructor http://www.gap-system.org/lib?matobj1?IsMatrixObj_st6
+dataconstructor http://www.gap-system.org/lib?matobj1?IsMatrixObj_st7
+dataconstructor http://www.gap-system.org/lib?matobj1?IsMatrixObj_st8
+dataconstructor http://www.gap-system.org/lib?matobj1?IsMatrixObj_st9
+dataconstructor http://www.gap-system.org/lib?matobj1?IsMatrixObj_st10
+dataconstructor http://www.gap-system.org/lib?matobj1?IsRowVectorObj
+dataconstructor http://www.gap-system.org/lib?matobj1?IsRowVectorObj_st0
+dataconstructor http://www.gap-system.org/lib?matobj1?IsRowVectorObj_st1
+dataconstructor http://www.gap-system.org/lib?matobj1?IsRowVectorObj_st2
+dataconstructor http://www.gap-system.org/lib?matobj1?IsRowVectorObj_st3
+dataconstructor http://www.gap-system.org/lib?matobj1?IsRowVectorObj_st4
+dataconstructor http://www.gap-system.org/lib?matobj1?IsRowVectorObj_st5
+dataconstructor http://www.gap-system.org/lib?matobj1?IsRowVectorObj_st6
+dataconstructor http://www.gap-system.org/lib?matobj1?IsRowVectorObj_st7
+dataconstructor http://www.gap-system.org/lib?matobj1?IsRowListMatrix
+dataconstructor http://www.gap-system.org/lib?matobj1?IsRowListMatrix_st0
+dataconstructor http://www.gap-system.org/lib?matobj1?IsRowListMatrix_st1
+dataconstructor http://www.gap-system.org/lib?matobj1?IsRowListMatrix_st2
+dataconstructor http://www.gap-system.org/lib?matobj1?IsRowListMatrix_st3
+dataconstructor http://www.gap-system.org/lib?matobj1?IsRowListMatrix_st4
+dataconstructor http://www.gap-system.org/lib?matobj1?IsRowListMatrix_st5
+dataconstructor http://www.gap-system.org/lib?matobj1?IsRowListMatrix_st6
+dataconstructor http://www.gap-system.org/lib?matobj1?IsRowListMatrix_st7
+dataconstructor http://www.gap-system.org/lib?matobj1?IsRowListMatrix_st8
+dataconstructor http://www.gap-system.org/lib?matobj1?IsRowListMatrix_st9
+dataconstructor http://www.gap-system.org/lib?matobj1?IsRowListMatrix_st10
+dataconstructor http://www.gap-system.org/lib?matobj1?IsRowListMatrix_st11
+dataconstructor http://www.gap-system.org/lib?matobj1?IsFlatMatrix
+dataconstructor http://www.gap-system.org/lib?matobj1?IsFlatMatrix_st0
+dataconstructor http://www.gap-system.org/lib?matobj1?IsFlatMatrix_st1
+dataconstructor http://www.gap-system.org/lib?matobj1?IsFlatMatrix_st2
+dataconstructor http://www.gap-system.org/lib?matobj1?IsFlatMatrix_st3
+dataconstructor http://www.gap-system.org/lib?matobj1?IsFlatMatrix_st4
+dataconstructor http://www.gap-system.org/lib?matobj1?IsFlatMatrix_st5
+dataconstructor http://www.gap-system.org/lib?matobj1?IsFlatMatrix_st6
+dataconstructor http://www.gap-system.org/lib?matobj1?IsFlatMatrix_st7
+dataconstructor http://www.gap-system.org/lib?matobj1?IsFlatMatrix_st8
+dataconstructor http://www.gap-system.org/lib?matobj1?IsFlatMatrix_st9
+dataconstructor http://www.gap-system.org/lib?matobj1?IsFlatMatrix_st10
+dataconstructor http://www.gap-system.org/lib?matobj1?IsFlatMatrix_st11
 theory http://www.gap-system.org/lib?matobj1
 HasMeta http://www.gap-system.org/lib?matobj1 http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?matobj1 http://www.gap-system.org/lib?object
@@ -91,7 +138,6 @@ Declares http://www.gap-system.org/lib?matobj1 http://www.gap-system.org/lib?mat
 constant http://www.gap-system.org/lib?matobj1?IsRowVectorObj_st6
 Declares http://www.gap-system.org/lib?matobj1 http://www.gap-system.org/lib?matobj1?IsRowVectorObj_st7
 constant http://www.gap-system.org/lib?matobj1?IsRowVectorObj_st7
-Includes http://www.gap-system.org/lib?matobj1 http://www.gap-system.org/lib?matobj1
 Declares http://www.gap-system.org/lib?matobj1 http://www.gap-system.org/lib?matobj1?IsRowListMatrix
 constant http://www.gap-system.org/lib?matobj1?IsRowListMatrix
 Declares http://www.gap-system.org/lib?matobj1 http://www.gap-system.org/lib?matobj1?IsRowListMatrix_st0
diff --git a/relational/http..www.gap-system.org/lib/matobj2.rel b/relational/http..www.gap-system.org/lib/matobj2.rel
index 404d7f588009badeb55e59c81dbd9f6ae009d95b..ea242ef73708959f162196f8e71d6b399419dd2c 100644
--- a/relational/http..www.gap-system.org/lib/matobj2.rel
+++ b/relational/http..www.gap-system.org/lib/matobj2.rel
@@ -151,6 +151,39 @@ implies http://www.gap-system.org/lib?matobj2?NewMatrix http://www.gap-system.or
 implies http://www.gap-system.org/lib?matobj2?NewMatrix http://www.gap-system.org/lib?semiring?IsRDistributive
 implies http://www.gap-system.org/lib?matobj2?NewMatrix http://www.gap-system.org/lib?cyclotom?IsInt
 implies http://www.gap-system.org/lib?matobj2?NewMatrix http://www.gap-system.org/lib?list?IsList
+dataconstructor http://www.gap-system.org/lib?matobj2?Fold
+dataconstructor http://www.gap-system.org/lib?matobj2?CopySubMatrix
+dataconstructor http://www.gap-system.org/lib?matobj2?NewRowVector
+dataconstructor http://www.gap-system.org/lib?matobj2?RowLength
+dataconstructor http://www.gap-system.org/lib?matobj2?ConstructingFilter
+dataconstructor http://www.gap-system.org/lib?matobj2?ZeroMatrix
+dataconstructor http://www.gap-system.org/lib?matobj2?Unpack
+dataconstructor http://www.gap-system.org/lib?matobj2?Unfold
+dataconstructor http://www.gap-system.org/lib?matobj2?IdentityMatrix
+dataconstructor http://www.gap-system.org/lib?matobj2?WeightOfVector
+dataconstructor http://www.gap-system.org/lib?matobj2?BaseDomain
+dataconstructor http://www.gap-system.org/lib?matobj2?NewIdentityMatrix
+dataconstructor http://www.gap-system.org/lib?matobj2?Vector
+dataconstructor http://www.gap-system.org/lib?matobj2?MatElm
+dataconstructor http://www.gap-system.org/lib?matobj2?MultMatrix
+dataconstructor http://www.gap-system.org/lib?matobj2?ChangedBaseDomain
+dataconstructor http://www.gap-system.org/lib?matobj2?ExtractSubMatrix
+dataconstructor http://www.gap-system.org/lib?matobj2?AddMatrix
+dataconstructor http://www.gap-system.org/lib?matobj2?NewZeroMatrix
+dataconstructor http://www.gap-system.org/lib?matobj2?Randomize
+dataconstructor http://www.gap-system.org/lib?matobj2?ZeroVector
+dataconstructor http://www.gap-system.org/lib?matobj2?DistanceOfVectors
+dataconstructor http://www.gap-system.org/lib?matobj2?NewCompanionMatrix
+dataconstructor http://www.gap-system.org/lib?matobj2?NewZeroVector
+dataconstructor http://www.gap-system.org/lib?matobj2?CopySubVector
+dataconstructor http://www.gap-system.org/lib?matobj2?CompatibleMatrix
+dataconstructor http://www.gap-system.org/lib?matobj2?ExtractSubVector
+dataconstructor http://www.gap-system.org/lib?matobj2?PositionLastNonZero
+dataconstructor http://www.gap-system.org/lib?matobj2?CompatibleVector
+dataconstructor http://www.gap-system.org/lib?matobj2?ProductTransposedMatMat
+dataconstructor http://www.gap-system.org/lib?matobj2?Matrix
+dataconstructor http://www.gap-system.org/lib?matobj2?CompanionMatrix
+dataconstructor http://www.gap-system.org/lib?matobj2?NewMatrix
 theory http://www.gap-system.org/lib?matobj2
 HasMeta http://www.gap-system.org/lib?matobj2 http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?matobj2 http://www.gap-system.org/lib?matobj1
diff --git a/relational/http..www.gap-system.org/lib/matobjplist.rel b/relational/http..www.gap-system.org/lib/matobjplist.rel
index cc5a5c861b081dedd3b9c77b393a67e7971f0567..01e0c9b02c2d7a642be4ca8de3d45c62427ff4a7 100644
--- a/relational/http..www.gap-system.org/lib/matobjplist.rel
+++ b/relational/http..www.gap-system.org/lib/matobjplist.rel
@@ -28,6 +28,36 @@ implies http://www.gap-system.org/lib?matobjplist?IsPlistMatrixRep_st13 http://w
 implies http://www.gap-system.org/lib?matobjplist?IsPlistMatrixRep_st13 http://www.gap-system.org/lib?matobj1?IsRowListMatrix
 IsFilter http://www.gap-system.org/lib?matobjplist?IsIntVector
 IsFilter http://www.gap-system.org/lib?matobjplist?IsCheckingMatrix
+dataconstructor http://www.gap-system.org/lib?matobjplist?IsCheckingVector
+dataconstructor http://www.gap-system.org/lib?matobjplist?IsFFEVector
+dataconstructor http://www.gap-system.org/lib?matobjplist?IsPlistVectorRep
+dataconstructor http://www.gap-system.org/lib?matobjplist?IsPlistVectorRep_st0
+dataconstructor http://www.gap-system.org/lib?matobjplist?IsPlistVectorRep_st1
+dataconstructor http://www.gap-system.org/lib?matobjplist?IsPlistVectorRep_st2
+dataconstructor http://www.gap-system.org/lib?matobjplist?IsPlistVectorRep_st3
+dataconstructor http://www.gap-system.org/lib?matobjplist?IsPlistVectorRep_st4
+dataconstructor http://www.gap-system.org/lib?matobjplist?IsPlistVectorRep_st5
+dataconstructor http://www.gap-system.org/lib?matobjplist?IsPlistVectorRep_st6
+dataconstructor http://www.gap-system.org/lib?matobjplist?IsPlistVectorRep_st7
+dataconstructor http://www.gap-system.org/lib?matobjplist?IsPlistVectorRep_st8
+dataconstructor http://www.gap-system.org/lib?matobjplist?IsPlistVectorRep_st9
+dataconstructor http://www.gap-system.org/lib?matobjplist?IsPlistMatrixRep
+dataconstructor http://www.gap-system.org/lib?matobjplist?IsPlistMatrixRep_st0
+dataconstructor http://www.gap-system.org/lib?matobjplist?IsPlistMatrixRep_st1
+dataconstructor http://www.gap-system.org/lib?matobjplist?IsPlistMatrixRep_st2
+dataconstructor http://www.gap-system.org/lib?matobjplist?IsPlistMatrixRep_st3
+dataconstructor http://www.gap-system.org/lib?matobjplist?IsPlistMatrixRep_st4
+dataconstructor http://www.gap-system.org/lib?matobjplist?IsPlistMatrixRep_st5
+dataconstructor http://www.gap-system.org/lib?matobjplist?IsPlistMatrixRep_st6
+dataconstructor http://www.gap-system.org/lib?matobjplist?IsPlistMatrixRep_st7
+dataconstructor http://www.gap-system.org/lib?matobjplist?IsPlistMatrixRep_st8
+dataconstructor http://www.gap-system.org/lib?matobjplist?IsPlistMatrixRep_st9
+dataconstructor http://www.gap-system.org/lib?matobjplist?IsPlistMatrixRep_st10
+dataconstructor http://www.gap-system.org/lib?matobjplist?IsPlistMatrixRep_st11
+dataconstructor http://www.gap-system.org/lib?matobjplist?IsPlistMatrixRep_st12
+dataconstructor http://www.gap-system.org/lib?matobjplist?IsPlistMatrixRep_st13
+dataconstructor http://www.gap-system.org/lib?matobjplist?IsIntVector
+dataconstructor http://www.gap-system.org/lib?matobjplist?IsCheckingMatrix
 theory http://www.gap-system.org/lib?matobjplist
 HasMeta http://www.gap-system.org/lib?matobjplist http://www.gap-system.org/?Types
 Declares http://www.gap-system.org/lib?matobjplist http://www.gap-system.org/lib?matobjplist?IsCheckingVector
diff --git a/relational/http..www.gap-system.org/lib/matrix.rel b/relational/http..www.gap-system.org/lib/matrix.rel
index 6c588e67e85b6ae83ffbe3b1bb4589a6b3e23e34..67f141b345d27dbf9ac764bfee7462d7ad559ece 100644
--- a/relational/http..www.gap-system.org/lib/matrix.rel
+++ b/relational/http..www.gap-system.org/lib/matrix.rel
@@ -383,6 +383,95 @@ implies http://www.gap-system.org/lib?matrix?IsMonomialMatrix http://www.gap-sys
 implies http://www.gap-system.org/lib?matrix?IsMonomialMatrix http://www.gap-system.org/lib?arith?IsNearAdditiveElementWithInverse
 implies http://www.gap-system.org/lib?matrix?IsMonomialMatrix http://www.gap-system.org/lib?arith?IsAdditiveElement
 implies http://www.gap-system.org/lib?matrix?IsMonomialMatrix http://www.gap-system.org/lib?arith?IsMultiplicativeElement
+dataconstructor http://www.gap-system.org/lib?matrix?SolutionMat
+dataconstructor http://www.gap-system.org/lib?matrix?TriangulizedNullspaceMatDestructive
+dataconstructor http://www.gap-system.org/lib?matrix?TriangulizedNullspaceMat
+dataconstructor http://www.gap-system.org/lib?matrix?DimensionsMat
+dataconstructor http://www.gap-system.org/lib?matrix?IsUpperTriangularMat
+dataconstructor http://www.gap-system.org/lib?matrix?IsNullMapMatrix
+dataconstructor http://www.gap-system.org/lib?matrix?IsNullMapMatrix_st0
+dataconstructor http://www.gap-system.org/lib?matrix?IsNullMapMatrix_st1
+dataconstructor http://www.gap-system.org/lib?matrix?IsNullMapMatrix_st2
+dataconstructor http://www.gap-system.org/lib?matrix?IsNullMapMatrix_st3
+dataconstructor http://www.gap-system.org/lib?matrix?IsNullMapMatrix_st4
+dataconstructor http://www.gap-system.org/lib?matrix?IsNullMapMatrix_st5
+dataconstructor http://www.gap-system.org/lib?matrix?IsNullMapMatrix_st6
+dataconstructor http://www.gap-system.org/lib?matrix?IsNullMapMatrix_st7
+dataconstructor http://www.gap-system.org/lib?matrix?IsNullMapMatrix_st8
+dataconstructor http://www.gap-system.org/lib?matrix?IsNullMapMatrix_st9
+dataconstructor http://www.gap-system.org/lib?matrix?IsNullMapMatrix_st10
+dataconstructor http://www.gap-system.org/lib?matrix?IsNullMapMatrix_st11
+dataconstructor http://www.gap-system.org/lib?matrix?IsNullMapMatrix_st12
+dataconstructor http://www.gap-system.org/lib?matrix?IsNullMapMatrix_st13
+dataconstructor http://www.gap-system.org/lib?matrix?IsNullMapMatrix_st14
+dataconstructor http://www.gap-system.org/lib?matrix?IsNullMapMatrix_st15
+dataconstructor http://www.gap-system.org/lib?matrix?IsNullMapMatrix_st16
+dataconstructor http://www.gap-system.org/lib?matrix?IsNullMapMatrix_st17
+dataconstructor http://www.gap-system.org/lib?matrix?IsNullMapMatrix_st18
+dataconstructor http://www.gap-system.org/lib?matrix?IsNullMapMatrix_st19
+dataconstructor http://www.gap-system.org/lib?matrix?IsNullMapMatrix_st20
+dataconstructor http://www.gap-system.org/lib?matrix?IsNullMapMatrix_st21
+dataconstructor http://www.gap-system.org/lib?matrix?IsNullMapMatrix_st22
+dataconstructor http://www.gap-system.org/lib?matrix?IsNullMapMatrix_st23
+dataconstructor http://www.gap-system.org/lib?matrix?IsNullMapMatrix_st24
+dataconstructor http://www.gap-system.org/lib?matrix?IsNullMapMatrix_st25
+dataconstructor http://www.gap-system.org/lib?matrix?IsNullMapMatrix_st26
+dataconstructor http://www.gap-system.org/lib?matrix?IsNullMapMatrix_st27
+dataconstructor http://www.gap-system.org/lib?matrix?IsNullMapMatrix_st28
+dataconstructor http://www.gap-system.org/lib?matrix?IsNullMapMatrix_st29
+dataconstructor http://www.gap-system.org/lib?matrix?SemiEchelonMat
+dataconstructor http://www.gap-system.org/lib?matrix?GeneralisedEigenvalues
+dataconstructor http://www.gap-system.org/lib?matrix?NullspaceMatDestructive
+dataconstructor http://www.gap-system.org/lib?matrix?InverseMatMod
+dataconstructor http://www.gap-system.org/lib?matrix?FieldOfMatrixList
+dataconstructor http://www.gap-system.org/lib?matrix?TransposedMatImmutable
+dataconstructor http://www.gap-system.org/lib?matrix?CharacteristicPolynomialMatrixNC
+dataconstructor http://www.gap-system.org/lib?matrix?ElementaryDivisorsMat
+dataconstructor http://www.gap-system.org/lib?matrix?Eigenvectors
+dataconstructor http://www.gap-system.org/lib?matrix?TransposedMatDestructive
+dataconstructor http://www.gap-system.org/lib?matrix?IsGeneralizedCartanMatrix
+dataconstructor http://www.gap-system.org/lib?matrix?BaseOrthogonalSpaceMat
+dataconstructor http://www.gap-system.org/lib?matrix?NullspaceMat
+dataconstructor http://www.gap-system.org/lib?matrix?TriangulizedMat
+dataconstructor http://www.gap-system.org/lib?matrix?MutableTransposedMatDestructive
+dataconstructor http://www.gap-system.org/lib?matrix?TransposedMatMutable
+dataconstructor http://www.gap-system.org/lib?matrix?DiagonalizeMat
+dataconstructor http://www.gap-system.org/lib?matrix?DeterminantMat
+dataconstructor http://www.gap-system.org/lib?matrix?KroneckerProduct
+dataconstructor http://www.gap-system.org/lib?matrix?ProjectiveOrder
+dataconstructor http://www.gap-system.org/lib?matrix?IsDiagonalMat
+dataconstructor http://www.gap-system.org/lib?matrix?IsLowerTriangularMat
+dataconstructor http://www.gap-system.org/lib?matrix?ElementaryDivisorsTransformationsMat
+dataconstructor http://www.gap-system.org/lib?matrix?TriangulizeMat
+dataconstructor http://www.gap-system.org/lib?matrix?GeneralisedEigenspaces
+dataconstructor http://www.gap-system.org/lib?matrix?TraceMat
+dataconstructor http://www.gap-system.org/lib?matrix?RankMat
+dataconstructor http://www.gap-system.org/lib?matrix?UpperSubdiagonal
+dataconstructor http://www.gap-system.org/lib?matrix?SolutionMatDestructive
+dataconstructor http://www.gap-system.org/lib?matrix?DepthOfUpperTriangularMatrix
+dataconstructor http://www.gap-system.org/lib?matrix?JordanDecomposition
+dataconstructor http://www.gap-system.org/lib?matrix?BaseMat
+dataconstructor http://www.gap-system.org/lib?matrix?DefaultScalarDomainOfMatrixList
+dataconstructor http://www.gap-system.org/lib?matrix?RankMatDestructive
+dataconstructor http://www.gap-system.org/lib?matrix?Eigenspaces
+dataconstructor http://www.gap-system.org/lib?matrix?BaseMatDestructive
+dataconstructor http://www.gap-system.org/lib?matrix?SemiEchelonMatTransformation
+dataconstructor http://www.gap-system.org/lib?matrix?DeterminantMatDestructive
+dataconstructor http://www.gap-system.org/lib?matrix?TriangulizedNullspaceMatNT
+dataconstructor http://www.gap-system.org/lib?matrix?SemiEchelonMatTransformationDestructive
+dataconstructor http://www.gap-system.org/lib?matrix?CharacteristicPolynomial
+dataconstructor http://www.gap-system.org/lib?matrix?DeterminantMatDivFree
+dataconstructor http://www.gap-system.org/lib?matrix?SemiEchelonMats
+dataconstructor http://www.gap-system.org/lib?matrix?Eigenvalues
+dataconstructor http://www.gap-system.org/lib?matrix?SolutionMatNoCo
+dataconstructor http://www.gap-system.org/lib?matrix?MinimalPolynomialMatrixNC
+dataconstructor http://www.gap-system.org/lib?matrix?SemiEchelonMatsDestructive
+dataconstructor http://www.gap-system.org/lib?matrix?SumIntersectionMat
+dataconstructor http://www.gap-system.org/lib?matrix?BaseField
+dataconstructor http://www.gap-system.org/lib?matrix?DefaultFieldOfMatrix
+dataconstructor http://www.gap-system.org/lib?matrix?SemiEchelonMatDestructive
+dataconstructor http://www.gap-system.org/lib?matrix?MutableCopyMat
+dataconstructor http://www.gap-system.org/lib?matrix?IsMonomialMatrix
 theory http://www.gap-system.org/lib?matrix
 HasMeta http://www.gap-system.org/lib?matrix http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?matrix http://www.gap-system.org/lib?list
diff --git a/relational/http..www.gap-system.org/lib/memory.rel b/relational/http..www.gap-system.org/lib/memory.rel
index a3d9a8466e0ffc87b91c73e0673637a986bacea2..7b367fb97f13ea14df7f45e3811f7d0d8b8a6d34 100644
--- a/relational/http..www.gap-system.org/lib/memory.rel
+++ b/relational/http..www.gap-system.org/lib/memory.rel
@@ -11,13 +11,24 @@ IsAttribute http://www.gap-system.org/lib?memory?StripMemory
 IsAttribute http://www.gap-system.org/lib?memory?TypeOfObjWithMemory
 implies http://www.gap-system.org/lib?memory?TypeOfObjWithMemory http://www.gap-system.org/lib?type?IsFamily
 IsAttribute http://www.gap-system.org/lib?memory?ForgetMemory
+dataconstructor http://www.gap-system.org/lib?memory?IsObjWithMemoryRankFilter
+dataconstructor http://www.gap-system.org/lib?memory?IsObjWithMemory
+dataconstructor http://www.gap-system.org/lib?memory?IsObjWithMemory_st0
+dataconstructor http://www.gap-system.org/lib?memory?IsObjWithMemory_st1
+dataconstructor http://www.gap-system.org/lib?memory?IsObjWithMemory_st2
+dataconstructor http://www.gap-system.org/lib?memory?IsObjWithMemory_st3
+dataconstructor http://www.gap-system.org/lib?memory?IsObjWithMemory_st4
+dataconstructor http://www.gap-system.org/lib?memory?IsObjWithMemory_st5
+dataconstructor http://www.gap-system.org/lib?memory?IsObjWithMemory_st6
+dataconstructor http://www.gap-system.org/lib?memory?StripMemory
+dataconstructor http://www.gap-system.org/lib?memory?TypeOfObjWithMemory
+dataconstructor http://www.gap-system.org/lib?memory?ForgetMemory
 theory http://www.gap-system.org/lib?memory
 HasMeta http://www.gap-system.org/lib?memory http://www.gap-system.org/?Types
 Declares http://www.gap-system.org/lib?memory http://www.gap-system.org/lib?memory?IsObjWithMemoryRankFilter
 constant http://www.gap-system.org/lib?memory?IsObjWithMemoryRankFilter
 Includes http://www.gap-system.org/lib?memory http://www.gap-system.org/lib?type
 Includes http://www.gap-system.org/lib?memory http://www.gap-system.org/lib?arith
-Includes http://www.gap-system.org/lib?memory http://www.gap-system.org/lib?memory
 Declares http://www.gap-system.org/lib?memory http://www.gap-system.org/lib?memory?IsObjWithMemory
 constant http://www.gap-system.org/lib?memory?IsObjWithMemory
 Declares http://www.gap-system.org/lib?memory http://www.gap-system.org/lib?memory?IsObjWithMemory_st0
diff --git a/relational/http..www.gap-system.org/lib/mgmadj.rel b/relational/http..www.gap-system.org/lib/mgmadj.rel
index 5ea84ce27b9044f17a3a58f160d60567b3feb8b2..27e16cfc212ce85b5c7ad480b766ac0e3b98dd28 100644
--- a/relational/http..www.gap-system.org/lib/mgmadj.rel
+++ b/relational/http..www.gap-system.org/lib/mgmadj.rel
@@ -34,6 +34,35 @@ implies http://www.gap-system.org/lib?mgmadj?InjectionZeroMagma http://www.gap-s
 IsAttribute http://www.gap-system.org/lib?mgmadj?MultiplicativeZeroOp
 implies http://www.gap-system.org/lib?mgmadj?MultiplicativeZeroOp http://www.gap-system.org/lib?mgmadj?IsMultiplicativeElementWithZero
 implies http://www.gap-system.org/lib?mgmadj?MultiplicativeZeroOp http://www.gap-system.org/lib?reesmat?IsReesMatrixSemigroup
+dataconstructor http://www.gap-system.org/lib?mgmadj?IsMultiplicativeElementWithZero
+dataconstructor http://www.gap-system.org/lib?mgmadj?IsMultiplicativeElementWithZero_st0
+dataconstructor http://www.gap-system.org/lib?mgmadj?IsMultiplicativeElementWithZero_st1
+dataconstructor http://www.gap-system.org/lib?mgmadj?IsMultiplicativeElementWithZero_st2
+dataconstructor http://www.gap-system.org/lib?mgmadj?IsMagmaWithZeroAdjoinedElementRep
+dataconstructor http://www.gap-system.org/lib?mgmadj?IsMagmaWithZeroAdjoinedElementRep_st0
+dataconstructor http://www.gap-system.org/lib?mgmadj?IsMagmaWithZeroAdjoinedElementRep_st1
+dataconstructor http://www.gap-system.org/lib?mgmadj?IsMagmaWithZeroAdjoinedElementRep_st2
+dataconstructor http://www.gap-system.org/lib?mgmadj?IsMagmaWithZeroAdjoinedElementRep_st3
+dataconstructor http://www.gap-system.org/lib?mgmadj?IsMagmaWithZeroAdjoinedElementRep_st4
+dataconstructor http://www.gap-system.org/lib?mgmadj?IsMagmaWithZeroAdjoinedElementRep_st5
+dataconstructor http://www.gap-system.org/lib?mgmadj?MultiplicativeZero
+dataconstructor http://www.gap-system.org/lib?mgmadj?IsMultiplicativeZero
+dataconstructor http://www.gap-system.org/lib?mgmadj?IsMagmaWithZeroAdjoined
+dataconstructor http://www.gap-system.org/lib?mgmadj?IsMagmaWithZeroAdjoined_st0
+dataconstructor http://www.gap-system.org/lib?mgmadj?IsMagmaWithZeroAdjoined_st1
+dataconstructor http://www.gap-system.org/lib?mgmadj?IsMagmaWithZeroAdjoined_st2
+dataconstructor http://www.gap-system.org/lib?mgmadj?IsMagmaWithZeroAdjoined_st3
+dataconstructor http://www.gap-system.org/lib?mgmadj?IsMagmaWithZeroAdjoined_st4
+dataconstructor http://www.gap-system.org/lib?mgmadj?IsMagmaWithZeroAdjoined_st5
+dataconstructor http://www.gap-system.org/lib?mgmadj?IsMagmaWithZeroAdjoined_st6
+dataconstructor http://www.gap-system.org/lib?mgmadj?IsMagmaWithZeroAdjoined_st7
+dataconstructor http://www.gap-system.org/lib?mgmadj?IsMagmaWithZeroAdjoined_st8
+dataconstructor http://www.gap-system.org/lib?mgmadj?IsMagmaWithZeroAdjoined_st9
+dataconstructor http://www.gap-system.org/lib?mgmadj?IsMagmaWithZeroAdjoined_st10
+dataconstructor http://www.gap-system.org/lib?mgmadj?UnderlyingInjectionZeroMagma
+dataconstructor http://www.gap-system.org/lib?mgmadj?MagmaWithZeroAdjoined
+dataconstructor http://www.gap-system.org/lib?mgmadj?InjectionZeroMagma
+dataconstructor http://www.gap-system.org/lib?mgmadj?MultiplicativeZeroOp
 theory http://www.gap-system.org/lib?mgmadj
 HasMeta http://www.gap-system.org/lib?mgmadj http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?mgmadj http://www.gap-system.org/lib?arith
@@ -46,7 +75,6 @@ constant http://www.gap-system.org/lib?mgmadj?IsMultiplicativeElementWithZero_st
 Declares http://www.gap-system.org/lib?mgmadj http://www.gap-system.org/lib?mgmadj?IsMultiplicativeElementWithZero_st2
 constant http://www.gap-system.org/lib?mgmadj?IsMultiplicativeElementWithZero_st2
 Includes http://www.gap-system.org/lib?mgmadj http://www.gap-system.org/lib?type
-Includes http://www.gap-system.org/lib?mgmadj http://www.gap-system.org/lib?mgmadj
 Declares http://www.gap-system.org/lib?mgmadj http://www.gap-system.org/lib?mgmadj?IsMagmaWithZeroAdjoinedElementRep
 constant http://www.gap-system.org/lib?mgmadj?IsMagmaWithZeroAdjoinedElementRep
 Declares http://www.gap-system.org/lib?mgmadj http://www.gap-system.org/lib?mgmadj?IsMagmaWithZeroAdjoinedElementRep_st0
diff --git a/relational/http..www.gap-system.org/lib/mgmcong.rel b/relational/http..www.gap-system.org/lib/mgmcong.rel
index e8f64d07d0311e7dea5029cb6ee39fd1f6e015af..222bb6cd727127748637fd702ae52f91e789a38b 100644
--- a/relational/http..www.gap-system.org/lib/mgmcong.rel
+++ b/relational/http..www.gap-system.org/lib/mgmcong.rel
@@ -57,6 +57,74 @@ implies http://www.gap-system.org/lib?mgmcong?RightMagmaCongruenceByGeneratingPa
 IsAttribute http://www.gap-system.org/lib?mgmcong?MagmaCongruenceByGeneratingPairs
 implies http://www.gap-system.org/lib?mgmcong?MagmaCongruenceByGeneratingPairs http://www.gap-system.org/lib?magma?IsMagma
 implies http://www.gap-system.org/lib?mgmcong?MagmaCongruenceByGeneratingPairs http://www.gap-system.org/lib?list?IsList
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsLeftMagmaCongruence
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsLeftMagmaCongruence_st0
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsLeftMagmaCongruence_st1
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsLeftMagmaCongruence_st2
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsLeftMagmaCongruence_st3
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsLeftMagmaCongruence_st4
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsLeftMagmaCongruence_st5
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsLeftMagmaCongruence_st6
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsLeftMagmaCongruence_st7
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsLeftMagmaCongruence_st8
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsLeftMagmaCongruence_st9
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsLeftMagmaCongruence_st10
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsLeftMagmaCongruence_st11
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsLeftMagmaCongruence_st12
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsLeftMagmaCongruence_st13
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsRightMagmaCongruence
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsRightMagmaCongruence_st0
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsRightMagmaCongruence_st1
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsRightMagmaCongruence_st2
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsRightMagmaCongruence_st3
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsRightMagmaCongruence_st4
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsRightMagmaCongruence_st5
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsRightMagmaCongruence_st6
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsRightMagmaCongruence_st7
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsRightMagmaCongruence_st8
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsRightMagmaCongruence_st9
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsRightMagmaCongruence_st10
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsRightMagmaCongruence_st11
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsRightMagmaCongruence_st12
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsRightMagmaCongruence_st13
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsMagmaCongruence
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsMagmaCongruence_st0
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsMagmaCongruence_st1
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsMagmaCongruence_st2
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsMagmaCongruence_st3
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsMagmaCongruence_st4
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsMagmaCongruence_st5
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsMagmaCongruence_st6
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsMagmaCongruence_st7
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsMagmaCongruence_st8
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsMagmaCongruence_st9
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsMagmaCongruence_st10
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsMagmaCongruence_st11
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsMagmaCongruence_st12
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsMagmaCongruence_st13
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsMagmaCongruence_st14
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsMagmaCongruence_st15
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsMagmaCongruence_st16
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsMagmaCongruence_st17
+dataconstructor http://www.gap-system.org/lib?mgmcong?GeneratingPairsOfLeftMagmaCongruence
+dataconstructor http://www.gap-system.org/lib?mgmcong?MeetMagmaCongruences
+dataconstructor http://www.gap-system.org/lib?mgmcong?JoinMagmaCongruences
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsCongruenceClass
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsCongruenceClass_st0
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsCongruenceClass_st1
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsCongruenceClass_st2
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsCongruenceClass_st3
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsCongruenceClass_st4
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsCongruenceClass_st5
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsCongruenceClass_st6
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsCongruenceClass_st7
+dataconstructor http://www.gap-system.org/lib?mgmcong?IsCongruenceClass_st8
+dataconstructor http://www.gap-system.org/lib?mgmcong?PartialClosureOfCongruence
+dataconstructor http://www.gap-system.org/lib?mgmcong?LeftMagmaCongruenceByGeneratingPairs
+dataconstructor http://www.gap-system.org/lib?mgmcong?GeneratingPairsOfRightMagmaCongruence
+dataconstructor http://www.gap-system.org/lib?mgmcong?GeneratingPairsOfMagmaCongruence
+dataconstructor http://www.gap-system.org/lib?mgmcong?RightMagmaCongruenceByGeneratingPairs
+dataconstructor http://www.gap-system.org/lib?mgmcong?MagmaCongruenceByGeneratingPairs
 theory http://www.gap-system.org/lib?mgmcong
 HasMeta http://www.gap-system.org/lib?mgmcong http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?mgmcong http://www.gap-system.org/lib?mapping
@@ -122,7 +190,6 @@ constant http://www.gap-system.org/lib?mgmcong?IsRightMagmaCongruence_st12
 Declares http://www.gap-system.org/lib?mgmcong http://www.gap-system.org/lib?mgmcong?IsRightMagmaCongruence_st13
 constant http://www.gap-system.org/lib?mgmcong?IsRightMagmaCongruence_st13
 Includes http://www.gap-system.org/lib?mgmcong http://www.gap-system.org/lib?mapphomo
-Includes http://www.gap-system.org/lib?mgmcong http://www.gap-system.org/lib?mgmcong
 Declares http://www.gap-system.org/lib?mgmcong http://www.gap-system.org/lib?mgmcong?IsMagmaCongruence
 constant http://www.gap-system.org/lib?mgmcong?IsMagmaCongruence
 Declares http://www.gap-system.org/lib?mgmcong http://www.gap-system.org/lib?mgmcong?IsMagmaCongruence_st0
diff --git a/relational/http..www.gap-system.org/lib/mgmhom.rel b/relational/http..www.gap-system.org/lib/mgmhom.rel
index b7af2db462dda93cedd40e4409456c9a4bc6a449..5f2a0c306355aa2b68afc22a64df4829de294fa3 100644
--- a/relational/http..www.gap-system.org/lib/mgmhom.rel
+++ b/relational/http..www.gap-system.org/lib/mgmhom.rel
@@ -5,6 +5,8 @@ implies http://www.gap-system.org/lib?mgmhom?IsMagmaHomomorphism http://www.gap-
 implies http://www.gap-system.org/lib?mgmhom?IsMagmaHomomorphism http://www.gap-system.org/lib?mapping?IsTotal
 implies http://www.gap-system.org/lib?mgmhom?IsMagmaHomomorphism http://www.gap-system.org/lib?mapping?IsSingleValued
 implies http://www.gap-system.org/lib?mgmhom?IsMagmaHomomorphism http://www.gap-system.org/lib?mapphomo?RespectsMultiplication
+dataconstructor http://www.gap-system.org/lib?mgmhom?NaturalHomomorphismByGenerators
+dataconstructor http://www.gap-system.org/lib?mgmhom?IsMagmaHomomorphism
 theory http://www.gap-system.org/lib?mgmhom
 HasMeta http://www.gap-system.org/lib?mgmhom http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?mgmhom http://www.gap-system.org/lib?magma
diff --git a/relational/http..www.gap-system.org/lib/mgmideal.rel b/relational/http..www.gap-system.org/lib/mgmideal.rel
index fa75b0a4d5ebe22b7bc5b0bcaecd54bb602cf856..a11d9b1aa24e07f5d3be56a5486706acd3fdde67 100644
--- a/relational/http..www.gap-system.org/lib/mgmideal.rel
+++ b/relational/http..www.gap-system.org/lib/mgmideal.rel
@@ -30,6 +30,16 @@ implies http://www.gap-system.org/lib?mgmideal?LeftMagmaIdealByGenerators http:/
 IsAttribute http://www.gap-system.org/lib?mgmideal?RightMagmaIdealByGenerators
 implies http://www.gap-system.org/lib?mgmideal?RightMagmaIdealByGenerators http://www.gap-system.org/lib?magma?IsMagma
 implies http://www.gap-system.org/lib?mgmideal?RightMagmaIdealByGenerators http://www.gap-system.org/lib?coll?IsCollection
+dataconstructor http://www.gap-system.org/lib?mgmideal?AsRightMagmaIdeal
+dataconstructor http://www.gap-system.org/lib?mgmideal?AsMagmaIdeal
+dataconstructor http://www.gap-system.org/lib?mgmideal?IsLeftMagmaIdeal
+dataconstructor http://www.gap-system.org/lib?mgmideal?AsLeftMagmaIdeal
+dataconstructor http://www.gap-system.org/lib?mgmideal?IsRightMagmaIdeal
+dataconstructor http://www.gap-system.org/lib?mgmideal?GeneratorsOfMagmaIdeal
+dataconstructor http://www.gap-system.org/lib?mgmideal?IsMagmaIdeal
+dataconstructor http://www.gap-system.org/lib?mgmideal?MagmaIdealByGenerators
+dataconstructor http://www.gap-system.org/lib?mgmideal?LeftMagmaIdealByGenerators
+dataconstructor http://www.gap-system.org/lib?mgmideal?RightMagmaIdealByGenerators
 theory http://www.gap-system.org/lib?mgmideal
 HasMeta http://www.gap-system.org/lib?mgmideal http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?mgmideal http://www.gap-system.org/lib?coll
diff --git a/relational/http..www.gap-system.org/lib/mgmring.rel b/relational/http..www.gap-system.org/lib/mgmring.rel
index 4ec23bc7cb976c5cea7cff3a351a64aef5cb5b7c..8b66ba052343ac089c64679cc4e2b85f30c1d7dd 100644
--- a/relational/http..www.gap-system.org/lib/mgmring.rel
+++ b/relational/http..www.gap-system.org/lib/mgmring.rel
@@ -198,6 +198,227 @@ implies http://www.gap-system.org/lib?mgmring?ElementOfMagmaRing http://www.gap-
 implies http://www.gap-system.org/lib?mgmring?ElementOfMagmaRing http://www.gap-system.org/lib?arith?IsAdditiveElement
 implies http://www.gap-system.org/lib?mgmring?ElementOfMagmaRing http://www.gap-system.org/lib?arith?IsMultiplicativeElement
 implies http://www.gap-system.org/lib?mgmring?ElementOfMagmaRing http://www.gap-system.org/lib?list?IsHomogeneousList
+dataconstructor http://www.gap-system.org/lib?mgmring?IsElementOfMagmaRingModuloRelations
+dataconstructor http://www.gap-system.org/lib?mgmring?IsElementOfMagmaRingModuloRelations_st0
+dataconstructor http://www.gap-system.org/lib?mgmring?IsElementOfMagmaRingModuloRelations_st1
+dataconstructor http://www.gap-system.org/lib?mgmring?IsElementOfMagmaRingModuloRelations_st2
+dataconstructor http://www.gap-system.org/lib?mgmring?IsElementOfMagmaRingModuloRelations_st3
+dataconstructor http://www.gap-system.org/lib?mgmring?IsElementOfMagmaRingModuloRelations_st4
+dataconstructor http://www.gap-system.org/lib?mgmring?IsElementOfMagmaRingModuloRelations_st5
+dataconstructor http://www.gap-system.org/lib?mgmring?IsElementOfMagmaRingModuloRelations_st6
+dataconstructor http://www.gap-system.org/lib?mgmring?IsElementOfMagmaRingModuloRelations_st7
+dataconstructor http://www.gap-system.org/lib?mgmring?IsElementOfMagmaRingModuloRelations_st8
+dataconstructor http://www.gap-system.org/lib?mgmring?IsElementOfMagmaRingModuloRelations_st9
+dataconstructor http://www.gap-system.org/lib?mgmring?IsElementOfMagmaRingModuloSpanOfZeroFamily
+dataconstructor http://www.gap-system.org/lib?mgmring?IsElementOfMagmaRingModuloSpanOfZeroFamily_st0
+dataconstructor http://www.gap-system.org/lib?mgmring?IsElementOfMagmaRingModuloSpanOfZeroFamily_st1
+dataconstructor http://www.gap-system.org/lib?mgmring?IsElementOfMagmaRingModuloSpanOfZeroFamily_st2
+dataconstructor http://www.gap-system.org/lib?mgmring?IsElementOfMagmaRingModuloSpanOfZeroFamily_st3
+dataconstructor http://www.gap-system.org/lib?mgmring?ZeroCoefficient
+dataconstructor http://www.gap-system.org/lib?mgmring?IsElementOfFreeMagmaRing
+dataconstructor http://www.gap-system.org/lib?mgmring?IsElementOfFreeMagmaRing_st0
+dataconstructor http://www.gap-system.org/lib?mgmring?IsElementOfFreeMagmaRing_st1
+dataconstructor http://www.gap-system.org/lib?mgmring?IsElementOfFreeMagmaRing_st2
+dataconstructor http://www.gap-system.org/lib?mgmring?IsElementOfFreeMagmaRing_st3
+dataconstructor http://www.gap-system.org/lib?mgmring?IsElementOfFreeMagmaRing_st4
+dataconstructor http://www.gap-system.org/lib?mgmring?IsElementOfFreeMagmaRing_st5
+dataconstructor http://www.gap-system.org/lib?mgmring?IsElementOfFreeMagmaRing_st6
+dataconstructor http://www.gap-system.org/lib?mgmring?IsElementOfFreeMagmaRing_st7
+dataconstructor http://www.gap-system.org/lib?mgmring?IsElementOfFreeMagmaRing_st8
+dataconstructor http://www.gap-system.org/lib?mgmring?IsElementOfFreeMagmaRing_st9
+dataconstructor http://www.gap-system.org/lib?mgmring?IsElementOfFreeMagmaRing_st10
+dataconstructor http://www.gap-system.org/lib?mgmring?NormalizedElementOfMagmaRingModuloRelations
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingObjDefaultRep
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingObjDefaultRep_st0
+dataconstructor http://www.gap-system.org/lib?mgmring?IsCanonicalBasisFreeMagmaRingRep
+dataconstructor http://www.gap-system.org/lib?mgmring?IsCanonicalBasisFreeMagmaRingRep_st0
+dataconstructor http://www.gap-system.org/lib?mgmring?IsCanonicalBasisFreeMagmaRingRep_st1
+dataconstructor http://www.gap-system.org/lib?mgmring?IsCanonicalBasisFreeMagmaRingRep_st2
+dataconstructor http://www.gap-system.org/lib?mgmring?IsCanonicalBasisFreeMagmaRingRep_st3
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloRelations
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloRelations_st0
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloRelations_st1
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloRelations_st2
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloRelations_st3
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloRelations_st4
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloRelations_st5
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloRelations_st6
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloRelations_st7
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloRelations_st8
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloRelations_st9
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloRelations_st10
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloRelations_st11
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloRelations_st12
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloRelations_st13
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloRelations_st14
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloRelations_st15
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloRelations_st16
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloRelations_st17
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloRelations_st18
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloRelations_st19
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloRelations_st20
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloRelations_st21
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloRelations_st22
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloRelations_st23
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloRelations_st24
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloRelations_st25
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloRelations_st26
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloRelations_st27
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloRelations_st28
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloRelations_st29
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloRelations_st30
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloRelations_st31
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloRelations_st32
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloRelations_st33
+dataconstructor http://www.gap-system.org/lib?mgmring?IsFreeMagmaRing
+dataconstructor http://www.gap-system.org/lib?mgmring?IsFreeMagmaRing_st0
+dataconstructor http://www.gap-system.org/lib?mgmring?IsFreeMagmaRing_st1
+dataconstructor http://www.gap-system.org/lib?mgmring?IsFreeMagmaRing_st2
+dataconstructor http://www.gap-system.org/lib?mgmring?IsFreeMagmaRing_st3
+dataconstructor http://www.gap-system.org/lib?mgmring?IsFreeMagmaRing_st4
+dataconstructor http://www.gap-system.org/lib?mgmring?IsFreeMagmaRing_st5
+dataconstructor http://www.gap-system.org/lib?mgmring?IsFreeMagmaRing_st6
+dataconstructor http://www.gap-system.org/lib?mgmring?IsFreeMagmaRing_st7
+dataconstructor http://www.gap-system.org/lib?mgmring?IsFreeMagmaRing_st8
+dataconstructor http://www.gap-system.org/lib?mgmring?IsFreeMagmaRing_st9
+dataconstructor http://www.gap-system.org/lib?mgmring?IsFreeMagmaRing_st10
+dataconstructor http://www.gap-system.org/lib?mgmring?IsFreeMagmaRing_st11
+dataconstructor http://www.gap-system.org/lib?mgmring?IsFreeMagmaRing_st12
+dataconstructor http://www.gap-system.org/lib?mgmring?IsFreeMagmaRing_st13
+dataconstructor http://www.gap-system.org/lib?mgmring?IsFreeMagmaRing_st14
+dataconstructor http://www.gap-system.org/lib?mgmring?IsFreeMagmaRing_st15
+dataconstructor http://www.gap-system.org/lib?mgmring?IsFreeMagmaRing_st16
+dataconstructor http://www.gap-system.org/lib?mgmring?IsFreeMagmaRing_st17
+dataconstructor http://www.gap-system.org/lib?mgmring?IsFreeMagmaRing_st18
+dataconstructor http://www.gap-system.org/lib?mgmring?IsFreeMagmaRing_st19
+dataconstructor http://www.gap-system.org/lib?mgmring?IsFreeMagmaRing_st20
+dataconstructor http://www.gap-system.org/lib?mgmring?IsFreeMagmaRing_st21
+dataconstructor http://www.gap-system.org/lib?mgmring?IsFreeMagmaRing_st22
+dataconstructor http://www.gap-system.org/lib?mgmring?IsFreeMagmaRing_st23
+dataconstructor http://www.gap-system.org/lib?mgmring?IsFreeMagmaRing_st24
+dataconstructor http://www.gap-system.org/lib?mgmring?IsFreeMagmaRing_st25
+dataconstructor http://www.gap-system.org/lib?mgmring?IsFreeMagmaRing_st26
+dataconstructor http://www.gap-system.org/lib?mgmring?IsFreeMagmaRing_st27
+dataconstructor http://www.gap-system.org/lib?mgmring?IsFreeMagmaRing_st28
+dataconstructor http://www.gap-system.org/lib?mgmring?IsFreeMagmaRing_st29
+dataconstructor http://www.gap-system.org/lib?mgmring?IsFreeMagmaRing_st30
+dataconstructor http://www.gap-system.org/lib?mgmring?IsFreeMagmaRing_st31
+dataconstructor http://www.gap-system.org/lib?mgmring?IsFreeMagmaRing_st32
+dataconstructor http://www.gap-system.org/lib?mgmring?IsFreeMagmaRing_st33
+dataconstructor http://www.gap-system.org/lib?mgmring?IsFreeMagmaRing_st34
+dataconstructor http://www.gap-system.org/lib?mgmring?UnderlyingMagma
+dataconstructor http://www.gap-system.org/lib?mgmring?AugmentationIdeal
+dataconstructor http://www.gap-system.org/lib?mgmring?IsEmbeddingMagmaMagmaRing
+dataconstructor http://www.gap-system.org/lib?mgmring?IsEmbeddingMagmaMagmaRing_st0
+dataconstructor http://www.gap-system.org/lib?mgmring?IsEmbeddingMagmaMagmaRing_st1
+dataconstructor http://www.gap-system.org/lib?mgmring?IsEmbeddingMagmaMagmaRing_st2
+dataconstructor http://www.gap-system.org/lib?mgmring?IsEmbeddingMagmaMagmaRing_st3
+dataconstructor http://www.gap-system.org/lib?mgmring?IsEmbeddingMagmaMagmaRing_st4
+dataconstructor http://www.gap-system.org/lib?mgmring?IsEmbeddingMagmaMagmaRing_st5
+dataconstructor http://www.gap-system.org/lib?mgmring?IsEmbeddingMagmaMagmaRing_st6
+dataconstructor http://www.gap-system.org/lib?mgmring?IsEmbeddingMagmaMagmaRing_st7
+dataconstructor http://www.gap-system.org/lib?mgmring?IsEmbeddingMagmaMagmaRing_st8
+dataconstructor http://www.gap-system.org/lib?mgmring?IsEmbeddingMagmaMagmaRing_st9
+dataconstructor http://www.gap-system.org/lib?mgmring?IsEmbeddingMagmaMagmaRing_st10
+dataconstructor http://www.gap-system.org/lib?mgmring?IsEmbeddingMagmaMagmaRing_st11
+dataconstructor http://www.gap-system.org/lib?mgmring?IsEmbeddingMagmaMagmaRing_st12
+dataconstructor http://www.gap-system.org/lib?mgmring?IsEmbeddingMagmaMagmaRing_st13
+dataconstructor http://www.gap-system.org/lib?mgmring?IsEmbeddingMagmaMagmaRing_st14
+dataconstructor http://www.gap-system.org/lib?mgmring?IsEmbeddingMagmaMagmaRing_st15
+dataconstructor http://www.gap-system.org/lib?mgmring?IsEmbeddingMagmaMagmaRing_st16
+dataconstructor http://www.gap-system.org/lib?mgmring?IsEmbeddingMagmaMagmaRing_st17
+dataconstructor http://www.gap-system.org/lib?mgmring?CoefficientsAndMagmaElements
+dataconstructor http://www.gap-system.org/lib?mgmring?IsGroupRing
+dataconstructor http://www.gap-system.org/lib?mgmring?IsSpaceOfElementsOfMagmaRing
+dataconstructor http://www.gap-system.org/lib?mgmring?IsSpaceOfElementsOfMagmaRing_st0
+dataconstructor http://www.gap-system.org/lib?mgmring?IsSpaceOfElementsOfMagmaRing_st1
+dataconstructor http://www.gap-system.org/lib?mgmring?IsSpaceOfElementsOfMagmaRing_st2
+dataconstructor http://www.gap-system.org/lib?mgmring?IsSpaceOfElementsOfMagmaRing_st3
+dataconstructor http://www.gap-system.org/lib?mgmring?IsSpaceOfElementsOfMagmaRing_st4
+dataconstructor http://www.gap-system.org/lib?mgmring?IsSpaceOfElementsOfMagmaRing_st5
+dataconstructor http://www.gap-system.org/lib?mgmring?IsSpaceOfElementsOfMagmaRing_st6
+dataconstructor http://www.gap-system.org/lib?mgmring?IsSpaceOfElementsOfMagmaRing_st7
+dataconstructor http://www.gap-system.org/lib?mgmring?IsSpaceOfElementsOfMagmaRing_st8
+dataconstructor http://www.gap-system.org/lib?mgmring?IsSpaceOfElementsOfMagmaRing_st9
+dataconstructor http://www.gap-system.org/lib?mgmring?IsSpaceOfElementsOfMagmaRing_st10
+dataconstructor http://www.gap-system.org/lib?mgmring?IsSpaceOfElementsOfMagmaRing_st11
+dataconstructor http://www.gap-system.org/lib?mgmring?IsSpaceOfElementsOfMagmaRing_st12
+dataconstructor http://www.gap-system.org/lib?mgmring?IsSpaceOfElementsOfMagmaRing_st13
+dataconstructor http://www.gap-system.org/lib?mgmring?IsSpaceOfElementsOfMagmaRing_st14
+dataconstructor http://www.gap-system.org/lib?mgmring?IsSpaceOfElementsOfMagmaRing_st15
+dataconstructor http://www.gap-system.org/lib?mgmring?IsSpaceOfElementsOfMagmaRing_st16
+dataconstructor http://www.gap-system.org/lib?mgmring?IsSpaceOfElementsOfMagmaRing_st17
+dataconstructor http://www.gap-system.org/lib?mgmring?IsSpaceOfElementsOfMagmaRing_st18
+dataconstructor http://www.gap-system.org/lib?mgmring?IsSpaceOfElementsOfMagmaRing_st19
+dataconstructor http://www.gap-system.org/lib?mgmring?IsSpaceOfElementsOfMagmaRing_st20
+dataconstructor http://www.gap-system.org/lib?mgmring?IsSpaceOfElementsOfMagmaRing_st21
+dataconstructor http://www.gap-system.org/lib?mgmring?IsSpaceOfElementsOfMagmaRing_st22
+dataconstructor http://www.gap-system.org/lib?mgmring?IsSpaceOfElementsOfMagmaRing_st23
+dataconstructor http://www.gap-system.org/lib?mgmring?IsSpaceOfElementsOfMagmaRing_st24
+dataconstructor http://www.gap-system.org/lib?mgmring?IsSpaceOfElementsOfMagmaRing_st25
+dataconstructor http://www.gap-system.org/lib?mgmring?IsFreeMagmaRingWithOne
+dataconstructor http://www.gap-system.org/lib?mgmring?IsEmbeddingRingMagmaRing
+dataconstructor http://www.gap-system.org/lib?mgmring?IsEmbeddingRingMagmaRing_st0
+dataconstructor http://www.gap-system.org/lib?mgmring?IsEmbeddingRingMagmaRing_st1
+dataconstructor http://www.gap-system.org/lib?mgmring?IsEmbeddingRingMagmaRing_st2
+dataconstructor http://www.gap-system.org/lib?mgmring?IsEmbeddingRingMagmaRing_st3
+dataconstructor http://www.gap-system.org/lib?mgmring?IsEmbeddingRingMagmaRing_st4
+dataconstructor http://www.gap-system.org/lib?mgmring?IsEmbeddingRingMagmaRing_st5
+dataconstructor http://www.gap-system.org/lib?mgmring?IsEmbeddingRingMagmaRing_st6
+dataconstructor http://www.gap-system.org/lib?mgmring?IsEmbeddingRingMagmaRing_st7
+dataconstructor http://www.gap-system.org/lib?mgmring?IsEmbeddingRingMagmaRing_st8
+dataconstructor http://www.gap-system.org/lib?mgmring?IsEmbeddingRingMagmaRing_st9
+dataconstructor http://www.gap-system.org/lib?mgmring?IsEmbeddingRingMagmaRing_st10
+dataconstructor http://www.gap-system.org/lib?mgmring?IsEmbeddingRingMagmaRing_st11
+dataconstructor http://www.gap-system.org/lib?mgmring?IsEmbeddingRingMagmaRing_st12
+dataconstructor http://www.gap-system.org/lib?mgmring?IsEmbeddingRingMagmaRing_st13
+dataconstructor http://www.gap-system.org/lib?mgmring?IsEmbeddingRingMagmaRing_st14
+dataconstructor http://www.gap-system.org/lib?mgmring?IsEmbeddingRingMagmaRing_st15
+dataconstructor http://www.gap-system.org/lib?mgmring?IsEmbeddingRingMagmaRing_st16
+dataconstructor http://www.gap-system.org/lib?mgmring?IsEmbeddingRingMagmaRing_st17
+dataconstructor http://www.gap-system.org/lib?mgmring?IsEmbeddingRingMagmaRing_st18
+dataconstructor http://www.gap-system.org/lib?mgmring?IsEmbeddingRingMagmaRing_st19
+dataconstructor http://www.gap-system.org/lib?mgmring?IsEmbeddingRingMagmaRing_st20
+dataconstructor http://www.gap-system.org/lib?mgmring?IsEmbeddingRingMagmaRing_st21
+dataconstructor http://www.gap-system.org/lib?mgmring?IsEmbeddingRingMagmaRing_st22
+dataconstructor http://www.gap-system.org/lib?mgmring?IsEmbeddingRingMagmaRing_st23
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloSpanOfZero
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloSpanOfZero_st0
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloSpanOfZero_st1
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloSpanOfZero_st2
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloSpanOfZero_st3
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloSpanOfZero_st4
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloSpanOfZero_st5
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloSpanOfZero_st6
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloSpanOfZero_st7
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloSpanOfZero_st8
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloSpanOfZero_st9
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloSpanOfZero_st10
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloSpanOfZero_st11
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloSpanOfZero_st12
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloSpanOfZero_st13
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloSpanOfZero_st14
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloSpanOfZero_st15
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloSpanOfZero_st16
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloSpanOfZero_st17
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloSpanOfZero_st18
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloSpanOfZero_st19
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloSpanOfZero_st20
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloSpanOfZero_st21
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloSpanOfZero_st22
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloSpanOfZero_st23
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloSpanOfZero_st24
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloSpanOfZero_st25
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloSpanOfZero_st26
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloSpanOfZero_st27
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloSpanOfZero_st28
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloSpanOfZero_st29
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloSpanOfZero_st30
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloSpanOfZero_st31
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloSpanOfZero_st32
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloSpanOfZero_st33
+dataconstructor http://www.gap-system.org/lib?mgmring?IsMagmaRingModuloSpanOfZero_st34
+dataconstructor http://www.gap-system.org/lib?mgmring?ElementOfMagmaRing
 theory http://www.gap-system.org/lib?mgmring
 HasMeta http://www.gap-system.org/lib?mgmring http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?mgmring http://www.gap-system.org/lib?arith
@@ -224,7 +445,6 @@ constant http://www.gap-system.org/lib?mgmring?IsElementOfMagmaRingModuloRelatio
 Declares http://www.gap-system.org/lib?mgmring http://www.gap-system.org/lib?mgmring?IsElementOfMagmaRingModuloRelations_st9
 constant http://www.gap-system.org/lib?mgmring?IsElementOfMagmaRingModuloRelations_st9
 Includes http://www.gap-system.org/lib?mgmring http://www.gap-system.org/lib?type
-Includes http://www.gap-system.org/lib?mgmring http://www.gap-system.org/lib?mgmring
 Declares http://www.gap-system.org/lib?mgmring http://www.gap-system.org/lib?mgmring?IsElementOfMagmaRingModuloSpanOfZeroFamily
 constant http://www.gap-system.org/lib?mgmring?IsElementOfMagmaRingModuloSpanOfZeroFamily
 Declares http://www.gap-system.org/lib?mgmring http://www.gap-system.org/lib?mgmring?IsElementOfMagmaRingModuloSpanOfZeroFamily_st0
diff --git a/relational/http..www.gap-system.org/lib/module.rel b/relational/http..www.gap-system.org/lib/module.rel
index fa20b20f9a3e28fff7555c67e79d1ede307e5be5..94391b8b4122165480070e7078647911ff70d582 100644
--- a/relational/http..www.gap-system.org/lib/module.rel
+++ b/relational/http..www.gap-system.org/lib/module.rel
@@ -133,6 +133,72 @@ implies http://www.gap-system.org/lib?module?ClosureLeftModule http://www.gap-sy
 implies http://www.gap-system.org/lib?module?ClosureLeftModule http://www.gap-system.org/lib?arith?IsAdditiveElement
 implies http://www.gap-system.org/lib?module?ClosureLeftModule http://www.gap-system.org/lib?arith?IsExtLElement
 implies http://www.gap-system.org/lib?module?ClosureLeftModule http://www.gap-system.org/lib?arith?IsExtRElement
+dataconstructor http://www.gap-system.org/lib?module?IsFreeLeftModule
+dataconstructor http://www.gap-system.org/lib?module?IsFreeLeftModule_st0
+dataconstructor http://www.gap-system.org/lib?module?IsFreeLeftModule_st1
+dataconstructor http://www.gap-system.org/lib?module?IsFreeLeftModule_st2
+dataconstructor http://www.gap-system.org/lib?module?IsFreeLeftModule_st3
+dataconstructor http://www.gap-system.org/lib?module?IsFreeLeftModule_st4
+dataconstructor http://www.gap-system.org/lib?module?IsFreeLeftModule_st5
+dataconstructor http://www.gap-system.org/lib?module?IsFreeLeftModule_st6
+dataconstructor http://www.gap-system.org/lib?module?IsFreeLeftModule_st7
+dataconstructor http://www.gap-system.org/lib?module?IsFreeLeftModule_st8
+dataconstructor http://www.gap-system.org/lib?module?IsFreeLeftModule_st9
+dataconstructor http://www.gap-system.org/lib?module?IsFreeLeftModule_st10
+dataconstructor http://www.gap-system.org/lib?module?IsFreeLeftModule_st11
+dataconstructor http://www.gap-system.org/lib?module?IsFreeLeftModule_st12
+dataconstructor http://www.gap-system.org/lib?module?IsFreeLeftModule_st13
+dataconstructor http://www.gap-system.org/lib?module?IsFreeLeftModule_st14
+dataconstructor http://www.gap-system.org/lib?module?IsFreeLeftModule_st15
+dataconstructor http://www.gap-system.org/lib?module?IsFreeLeftModule_st16
+dataconstructor http://www.gap-system.org/lib?module?IsFreeLeftModule_st17
+dataconstructor http://www.gap-system.org/lib?module?IsFreeLeftModule_st18
+dataconstructor http://www.gap-system.org/lib?module?IsFreeLeftModule_st19
+dataconstructor http://www.gap-system.org/lib?module?IsFreeLeftModule_st20
+dataconstructor http://www.gap-system.org/lib?module?IsFreeLeftModule_st21
+dataconstructor http://www.gap-system.org/lib?module?IsHandledByNiceBasis
+dataconstructor http://www.gap-system.org/lib?module?IsHandledByNiceBasis_st0
+dataconstructor http://www.gap-system.org/lib?module?IsHandledByNiceBasis_st1
+dataconstructor http://www.gap-system.org/lib?module?IsHandledByNiceBasis_st2
+dataconstructor http://www.gap-system.org/lib?module?IsHandledByNiceBasis_st3
+dataconstructor http://www.gap-system.org/lib?module?IsHandledByNiceBasis_st4
+dataconstructor http://www.gap-system.org/lib?module?IsHandledByNiceBasis_st5
+dataconstructor http://www.gap-system.org/lib?module?IsHandledByNiceBasis_st6
+dataconstructor http://www.gap-system.org/lib?module?IsHandledByNiceBasis_st7
+dataconstructor http://www.gap-system.org/lib?module?IsHandledByNiceBasis_st8
+dataconstructor http://www.gap-system.org/lib?module?IsHandledByNiceBasis_st9
+dataconstructor http://www.gap-system.org/lib?module?IsHandledByNiceBasis_st10
+dataconstructor http://www.gap-system.org/lib?module?IsHandledByNiceBasis_st11
+dataconstructor http://www.gap-system.org/lib?module?IsHandledByNiceBasis_st12
+dataconstructor http://www.gap-system.org/lib?module?IsHandledByNiceBasis_st13
+dataconstructor http://www.gap-system.org/lib?module?IsHandledByNiceBasis_st14
+dataconstructor http://www.gap-system.org/lib?module?IsHandledByNiceBasis_st15
+dataconstructor http://www.gap-system.org/lib?module?IsHandledByNiceBasis_st16
+dataconstructor http://www.gap-system.org/lib?module?IsHandledByNiceBasis_st17
+dataconstructor http://www.gap-system.org/lib?module?IsHandledByNiceBasis_st18
+dataconstructor http://www.gap-system.org/lib?module?IsHandledByNiceBasis_st19
+dataconstructor http://www.gap-system.org/lib?module?IsHandledByNiceBasis_st20
+dataconstructor http://www.gap-system.org/lib?module?IsHandledByNiceBasis_st21
+dataconstructor http://www.gap-system.org/lib?module?IsHandledByNiceBasis_st22
+dataconstructor http://www.gap-system.org/lib?module?IsHandledByNiceBasis_st23
+dataconstructor http://www.gap-system.org/lib?module?IsHandledByNiceBasis_st24
+dataconstructor http://www.gap-system.org/lib?module?AsLeftModule
+dataconstructor http://www.gap-system.org/lib?module?IsRightModule
+dataconstructor http://www.gap-system.org/lib?module?GeneratorsOfLeftOperatorAdditiveGroup
+dataconstructor http://www.gap-system.org/lib?module?DimensionOfVectors
+dataconstructor http://www.gap-system.org/lib?module?IsRightOperatorAdditiveGroup
+dataconstructor http://www.gap-system.org/lib?module?IsMatrixModule
+dataconstructor http://www.gap-system.org/lib?module?IsFiniteDimensional
+dataconstructor http://www.gap-system.org/lib?module?Dimension
+dataconstructor http://www.gap-system.org/lib?module?IsFullRowModule
+dataconstructor http://www.gap-system.org/lib?module?GeneratorsOfRightOperatorAdditiveGroup
+dataconstructor http://www.gap-system.org/lib?module?LeftModuleByGenerators
+dataconstructor http://www.gap-system.org/lib?module?IsLeftOperatorAdditiveGroup
+dataconstructor http://www.gap-system.org/lib?module?IsRowModule
+dataconstructor http://www.gap-system.org/lib?module?IsFullMatrixModule
+dataconstructor http://www.gap-system.org/lib?module?UseBasis
+dataconstructor http://www.gap-system.org/lib?module?IsLeftModule
+dataconstructor http://www.gap-system.org/lib?module?ClosureLeftModule
 theory http://www.gap-system.org/lib?module
 HasMeta http://www.gap-system.org/lib?module http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?module http://www.gap-system.org/lib?coll
@@ -188,7 +254,6 @@ constant http://www.gap-system.org/lib?module?IsFreeLeftModule_st20
 Declares http://www.gap-system.org/lib?module http://www.gap-system.org/lib?module?IsFreeLeftModule_st21
 constant http://www.gap-system.org/lib?module?IsFreeLeftModule_st21
 Includes http://www.gap-system.org/lib?module http://www.gap-system.org/lib?type
-Includes http://www.gap-system.org/lib?module http://www.gap-system.org/lib?module
 Declares http://www.gap-system.org/lib?module http://www.gap-system.org/lib?module?IsHandledByNiceBasis
 constant http://www.gap-system.org/lib?module?IsHandledByNiceBasis
 Declares http://www.gap-system.org/lib?module http://www.gap-system.org/lib?module?IsHandledByNiceBasis_st0
diff --git a/relational/http..www.gap-system.org/lib/monoid.rel b/relational/http..www.gap-system.org/lib/monoid.rel
index 412930d7a4f02f44970523e7d79f2230ff0d3e67..c6310d9970de24d37d512fea81b5eb9b8dfea9aa 100644
--- a/relational/http..www.gap-system.org/lib/monoid.rel
+++ b/relational/http..www.gap-system.org/lib/monoid.rel
@@ -8,6 +8,10 @@ implies http://www.gap-system.org/lib?monoid?AsSubmonoid http://www.gap-system.o
 implies http://www.gap-system.org/lib?monoid?AsSubmonoid http://www.gap-system.org/lib?domain?IsGeneralizedDomain
 IsAttribute http://www.gap-system.org/lib?monoid?MonoidByGenerators
 implies http://www.gap-system.org/lib?monoid?MonoidByGenerators http://www.gap-system.org/lib?coll?IsCollection
+dataconstructor http://www.gap-system.org/lib?monoid?IsMonoid
+dataconstructor http://www.gap-system.org/lib?monoid?AsMonoid
+dataconstructor http://www.gap-system.org/lib?monoid?AsSubmonoid
+dataconstructor http://www.gap-system.org/lib?monoid?MonoidByGenerators
 theory http://www.gap-system.org/lib?monoid
 HasMeta http://www.gap-system.org/lib?monoid http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?monoid http://www.gap-system.org/lib?magma
diff --git a/relational/http..www.gap-system.org/lib/morpheus.rel b/relational/http..www.gap-system.org/lib/morpheus.rel
index 4866b145d7c4b06ea097011e519c9bbe6a375145..5b32277e7870ace73f900295ca853c3837c96823 100644
--- a/relational/http..www.gap-system.org/lib/morpheus.rel
+++ b/relational/http..www.gap-system.org/lib/morpheus.rel
@@ -39,6 +39,38 @@ implies http://www.gap-system.org/lib?morpheus?AutomorphismDomain http://www.gap
 IsAttribute http://www.gap-system.org/lib?morpheus?AutomorphismGroup
 implies http://www.gap-system.org/lib?morpheus?AutomorphismGroup http://www.gap-system.org/lib?coll?IsCollection
 implies http://www.gap-system.org/lib?morpheus?AutomorphismGroup http://www.gap-system.org/lib?domain?IsGeneralizedDomain
+dataconstructor http://www.gap-system.org/lib?morpheus?InnerAutomorphismsAutomorphismGroup
+dataconstructor http://www.gap-system.org/lib?morpheus?IsGroupOfAutomorphisms
+dataconstructor http://www.gap-system.org/lib?morpheus?IsAutomorphismGroup
+dataconstructor http://www.gap-system.org/lib?morpheus?GQuotients
+dataconstructor http://www.gap-system.org/lib?morpheus?IsGroupOfAutomorphismsFiniteGroup
+dataconstructor http://www.gap-system.org/lib?morpheus?IsActionHomomorphismAutomGroup
+dataconstructor http://www.gap-system.org/lib?morpheus?IsActionHomomorphismAutomGroup_st0
+dataconstructor http://www.gap-system.org/lib?morpheus?IsActionHomomorphismAutomGroup_st1
+dataconstructor http://www.gap-system.org/lib?morpheus?IsActionHomomorphismAutomGroup_st2
+dataconstructor http://www.gap-system.org/lib?morpheus?IsActionHomomorphismAutomGroup_st3
+dataconstructor http://www.gap-system.org/lib?morpheus?IsActionHomomorphismAutomGroup_st4
+dataconstructor http://www.gap-system.org/lib?morpheus?IsActionHomomorphismAutomGroup_st5
+dataconstructor http://www.gap-system.org/lib?morpheus?IsActionHomomorphismAutomGroup_st6
+dataconstructor http://www.gap-system.org/lib?morpheus?IsActionHomomorphismAutomGroup_st7
+dataconstructor http://www.gap-system.org/lib?morpheus?IsActionHomomorphismAutomGroup_st8
+dataconstructor http://www.gap-system.org/lib?morpheus?IsActionHomomorphismAutomGroup_st9
+dataconstructor http://www.gap-system.org/lib?morpheus?IsActionHomomorphismAutomGroup_st10
+dataconstructor http://www.gap-system.org/lib?morpheus?IsActionHomomorphismAutomGroup_st11
+dataconstructor http://www.gap-system.org/lib?morpheus?IsActionHomomorphismAutomGroup_st12
+dataconstructor http://www.gap-system.org/lib?morpheus?IsActionHomomorphismAutomGroup_st13
+dataconstructor http://www.gap-system.org/lib?morpheus?IsActionHomomorphismAutomGroup_st14
+dataconstructor http://www.gap-system.org/lib?morpheus?IsActionHomomorphismAutomGroup_st15
+dataconstructor http://www.gap-system.org/lib?morpheus?IsActionHomomorphismAutomGroup_st16
+dataconstructor http://www.gap-system.org/lib?morpheus?IsActionHomomorphismAutomGroup_st17
+dataconstructor http://www.gap-system.org/lib?morpheus?IsActionHomomorphismAutomGroup_st18
+dataconstructor http://www.gap-system.org/lib?morpheus?IsActionHomomorphismAutomGroup_st19
+dataconstructor http://www.gap-system.org/lib?morpheus?IsActionHomomorphismAutomGroup_st20
+dataconstructor http://www.gap-system.org/lib?morpheus?IsActionHomomorphismAutomGroup_st21
+dataconstructor http://www.gap-system.org/lib?morpheus?IsActionHomomorphismAutomGroup_st22
+dataconstructor http://www.gap-system.org/lib?morpheus?IsomorphicSubgroups
+dataconstructor http://www.gap-system.org/lib?morpheus?AutomorphismDomain
+dataconstructor http://www.gap-system.org/lib?morpheus?AutomorphismGroup
 theory http://www.gap-system.org/lib?morpheus
 HasMeta http://www.gap-system.org/lib?morpheus http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?morpheus http://www.gap-system.org/lib?magma
@@ -46,7 +78,6 @@ Declares http://www.gap-system.org/lib?morpheus http://www.gap-system.org/lib?mo
 constant http://www.gap-system.org/lib?morpheus?InnerAutomorphismsAutomorphismGroup
 Declares http://www.gap-system.org/lib?morpheus http://www.gap-system.org/lib?morpheus?IsGroupOfAutomorphisms
 constant http://www.gap-system.org/lib?morpheus?IsGroupOfAutomorphisms
-Includes http://www.gap-system.org/lib?morpheus http://www.gap-system.org/lib?morpheus
 Declares http://www.gap-system.org/lib?morpheus http://www.gap-system.org/lib?morpheus?IsAutomorphismGroup
 constant http://www.gap-system.org/lib?morpheus?IsAutomorphismGroup
 Declares http://www.gap-system.org/lib?morpheus http://www.gap-system.org/lib?morpheus?GQuotients
diff --git a/relational/http..www.gap-system.org/lib/numtheor.rel b/relational/http..www.gap-system.org/lib/numtheor.rel
index 8fc84821f366fe59864a5f41b08e5a659760f08d..96f3fcc8952094ff80b71c1cb02c5f03ae230ef9 100644
--- a/relational/http..www.gap-system.org/lib/numtheor.rel
+++ b/relational/http..www.gap-system.org/lib/numtheor.rel
@@ -2,6 +2,10 @@ IsAttribute http://www.gap-system.org/lib?numtheor?Phi
 IsAttribute http://www.gap-system.org/lib?numtheor?Sigma
 IsAttribute http://www.gap-system.org/lib?numtheor?Tau
 IsAttribute http://www.gap-system.org/lib?numtheor?Lambda
+dataconstructor http://www.gap-system.org/lib?numtheor?Phi
+dataconstructor http://www.gap-system.org/lib?numtheor?Sigma
+dataconstructor http://www.gap-system.org/lib?numtheor?Tau
+dataconstructor http://www.gap-system.org/lib?numtheor?Lambda
 theory http://www.gap-system.org/lib?numtheor
 HasMeta http://www.gap-system.org/lib?numtheor http://www.gap-system.org/?Types
 Declares http://www.gap-system.org/lib?numtheor http://www.gap-system.org/lib?numtheor?Phi
diff --git a/relational/http..www.gap-system.org/lib/object.rel b/relational/http..www.gap-system.org/lib/object.rel
index 3fa879cfddc7ceba41b8231b70d60ce66967785f..6abd89502fcee2ddb952214d23216fe81daff2c6 100644
--- a/relational/http..www.gap-system.org/lib/object.rel
+++ b/relational/http..www.gap-system.org/lib/object.rel
@@ -29,11 +29,37 @@ implies http://www.gap-system.org/lib?object?InfoText http://www.gap-system.org/
 IsAttribute http://www.gap-system.org/lib?object?String
 implies http://www.gap-system.org/lib?object?String http://www.gap-system.org/lib?cyclotom?IsInt
 IsAttribute http://www.gap-system.org/lib?object?<
+dataconstructor http://www.gap-system.org/lib?object?IsCopyable
+dataconstructor http://www.gap-system.org/lib?object?IsMutable
+dataconstructor http://www.gap-system.org/lib?object?IsMutable_st0
+dataconstructor http://www.gap-system.org/lib?object?MemoryUsage
+dataconstructor http://www.gap-system.org/lib?object?KnownTruePropertiesOfObject
+dataconstructor http://www.gap-system.org/lib?object?DisplayString
+dataconstructor http://www.gap-system.org/lib?object?=
+dataconstructor http://www.gap-system.org/lib?object?Name
+dataconstructor http://www.gap-system.org/lib?object?ShallowCopy
+dataconstructor http://www.gap-system.org/lib?object?KnownPropertiesOfObject
+dataconstructor http://www.gap-system.org/lib?object?IsInternallyConsistent
+dataconstructor http://www.gap-system.org/lib?object?KnownAttributesOfObject
+dataconstructor http://www.gap-system.org/lib?object?CategoriesOfObject
+dataconstructor http://www.gap-system.org/lib?object?PostMakeImmutable
+dataconstructor http://www.gap-system.org/lib?object?ObjByExtRep
+dataconstructor http://www.gap-system.org/lib?object?RepresentationsOfObject
+dataconstructor http://www.gap-system.org/lib?object?Display
+dataconstructor http://www.gap-system.org/lib?object?ExtRepOfObj
+dataconstructor http://www.gap-system.org/lib?object?IsPackedElementDefaultRep
+dataconstructor http://www.gap-system.org/lib?object?IsPackedElementDefaultRep_st0
+dataconstructor http://www.gap-system.org/lib?object?in
+dataconstructor http://www.gap-system.org/lib?object?IsImpossible
+dataconstructor http://www.gap-system.org/lib?object?PrintString
+dataconstructor http://www.gap-system.org/lib?object?PrintObj
+dataconstructor http://www.gap-system.org/lib?object?InfoText
+dataconstructor http://www.gap-system.org/lib?object?String
+dataconstructor http://www.gap-system.org/lib?object?<
 theory http://www.gap-system.org/lib?object
 HasMeta http://www.gap-system.org/lib?object http://www.gap-system.org/?Types
 Declares http://www.gap-system.org/lib?object http://www.gap-system.org/lib?object?IsCopyable
 constant http://www.gap-system.org/lib?object?IsCopyable
-Includes http://www.gap-system.org/lib?object http://www.gap-system.org/lib?object
 Declares http://www.gap-system.org/lib?object http://www.gap-system.org/lib?object?IsMutable
 constant http://www.gap-system.org/lib?object?IsMutable
 Declares http://www.gap-system.org/lib?object http://www.gap-system.org/lib?object?IsMutable_st0
diff --git a/relational/http..www.gap-system.org/lib/objset.rel b/relational/http..www.gap-system.org/lib/objset.rel
index 59a905aeea7b644623eb43ace66c463f3bbf312c..55bdd9e9ef07fb444a3180cae7f020eb917f53d9 100644
--- a/relational/http..www.gap-system.org/lib/objset.rel
+++ b/relational/http..www.gap-system.org/lib/objset.rel
@@ -2,6 +2,10 @@ IsFilter http://www.gap-system.org/lib?objset?IsObjMap
 implies http://www.gap-system.org/lib?objset?IsObjMap_st0 http://www.gap-system.org/lib?type?IsInternalRep
 IsFilter http://www.gap-system.org/lib?objset?IsObjSet
 implies http://www.gap-system.org/lib?objset?IsObjSet_st0 http://www.gap-system.org/lib?type?IsInternalRep
+dataconstructor http://www.gap-system.org/lib?objset?IsObjMap
+dataconstructor http://www.gap-system.org/lib?objset?IsObjMap_st0
+dataconstructor http://www.gap-system.org/lib?objset?IsObjSet
+dataconstructor http://www.gap-system.org/lib?objset?IsObjSet_st0
 theory http://www.gap-system.org/lib?objset
 HasMeta http://www.gap-system.org/lib?objset http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?objset http://www.gap-system.org/lib?type
diff --git a/relational/http..www.gap-system.org/lib/obsolete.rel b/relational/http..www.gap-system.org/lib/obsolete.rel
index 893aef5bbe969d081c8a66d9e4f53fe0733f60eb..033758c88dab6043cd203ea934789feb1ee5211f 100644
--- a/relational/http..www.gap-system.org/lib/obsolete.rel
+++ b/relational/http..www.gap-system.org/lib/obsolete.rel
@@ -5,6 +5,10 @@ IsAttribute http://www.gap-system.org/lib?obsolete?ShrinkCoeffs
 implies http://www.gap-system.org/lib?obsolete?ShrinkCoeffs http://www.gap-system.org/lib?object?IsMutable
 implies http://www.gap-system.org/lib?obsolete?ShrinkCoeffs http://www.gap-system.org/lib?list?IsList
 IsAttribute http://www.gap-system.org/lib?obsolete?LaTeXObj
+dataconstructor http://www.gap-system.org/lib?obsolete?TeXObj
+dataconstructor http://www.gap-system.org/lib?obsolete?PositionFirstComponent
+dataconstructor http://www.gap-system.org/lib?obsolete?ShrinkCoeffs
+dataconstructor http://www.gap-system.org/lib?obsolete?LaTeXObj
 theory http://www.gap-system.org/lib?obsolete
 HasMeta http://www.gap-system.org/lib?obsolete http://www.gap-system.org/?Types
 Declares http://www.gap-system.org/lib?obsolete http://www.gap-system.org/lib?obsolete?TeXObj
diff --git a/relational/http..www.gap-system.org/lib/onecohom.rel b/relational/http..www.gap-system.org/lib/onecohom.rel
index 91c430a62b778db37200e578cf4b595cd7fbd4df..e06ef2208cfac8a286dda0471026361046664021 100644
--- a/relational/http..www.gap-system.org/lib/onecohom.rel
+++ b/relational/http..www.gap-system.org/lib/onecohom.rel
@@ -23,6 +23,13 @@ implies http://www.gap-system.org/lib?onecohom?OCAddBigMatrices http://www.gap-s
 IsAttribute http://www.gap-system.org/lib?onecohom?OCAddToFunctions2
 implies http://www.gap-system.org/lib?onecohom?OCAddToFunctions2 http://www.gap-system.org/lib?record?IsRecord
 implies http://www.gap-system.org/lib?onecohom?OCAddToFunctions2 http://www.gap-system.org/lib?coll?IsListOrCollection
+dataconstructor http://www.gap-system.org/lib?onecohom?OCNormalRelations
+dataconstructor http://www.gap-system.org/lib?onecohom?OCAddComplement
+dataconstructor http://www.gap-system.org/lib?onecohom?OCAddRelations
+dataconstructor http://www.gap-system.org/lib?onecohom?OCAddSumMatrices
+dataconstructor http://www.gap-system.org/lib?onecohom?OCCoprimeComplement
+dataconstructor http://www.gap-system.org/lib?onecohom?OCAddBigMatrices
+dataconstructor http://www.gap-system.org/lib?onecohom?OCAddToFunctions2
 theory http://www.gap-system.org/lib?onecohom
 HasMeta http://www.gap-system.org/lib?onecohom http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?onecohom http://www.gap-system.org/lib?record
diff --git a/relational/http..www.gap-system.org/lib/oper.rel b/relational/http..www.gap-system.org/lib/oper.rel
index 54550481547609a97666b72e49f8f3a4099ac828..74a3be3da12db83ee4a847ec9b4d9e760c8a2caf 100644
--- a/relational/http..www.gap-system.org/lib/oper.rel
+++ b/relational/http..www.gap-system.org/lib/oper.rel
@@ -1,6 +1,9 @@
 IsFilter http://www.gap-system.org/lib?oper?IsNoImmediateMethodsObject
 IsAttribute http://www.gap-system.org/lib?oper?ViewObj
 IsAttribute http://www.gap-system.org/lib?oper?ViewString
+dataconstructor http://www.gap-system.org/lib?oper?IsNoImmediateMethodsObject
+dataconstructor http://www.gap-system.org/lib?oper?ViewObj
+dataconstructor http://www.gap-system.org/lib?oper?ViewString
 theory http://www.gap-system.org/lib?oper
 HasMeta http://www.gap-system.org/lib?oper http://www.gap-system.org/?Types
 Declares http://www.gap-system.org/lib?oper http://www.gap-system.org/lib?oper?IsNoImmediateMethodsObject
diff --git a/relational/http..www.gap-system.org/lib/oprt.rel b/relational/http..www.gap-system.org/lib/oprt.rel
index 14d218411242b5477f8e52a995b2a33e1de74caf..2626981535b3d0365b11da898802f9de40684ebd 100644
--- a/relational/http..www.gap-system.org/lib/oprt.rel
+++ b/relational/http..www.gap-system.org/lib/oprt.rel
@@ -434,6 +434,294 @@ implies http://www.gap-system.org/lib?oprt?IsPrimitive http://www.gap-system.org
 implies http://www.gap-system.org/lib?oprt?IsPrimitive http://www.gap-system.org/lib?function?IsFunction
 IsAttribute http://www.gap-system.org/lib?oprt?CanEasilyDetermineCanonicalRepresentativeExternalSet
 implies http://www.gap-system.org/lib?oprt?CanEasilyDetermineCanonicalRepresentativeExternalSet http://www.gap-system.org/lib?oprt?IsExternalSet
+dataconstructor http://www.gap-system.org/lib?oprt?PermutationOp
+dataconstructor http://www.gap-system.org/lib?oprt?IsExternalSet
+dataconstructor http://www.gap-system.org/lib?oprt?IsExternalSet_st0
+dataconstructor http://www.gap-system.org/lib?oprt?IsExternalSet_st1
+dataconstructor http://www.gap-system.org/lib?oprt?IsExternalSet_st2
+dataconstructor http://www.gap-system.org/lib?oprt?IsExternalSet_st3
+dataconstructor http://www.gap-system.org/lib?oprt?IsExternalSet_st4
+dataconstructor http://www.gap-system.org/lib?oprt?IsTransitive
+dataconstructor http://www.gap-system.org/lib?oprt?RepresentativesMinimalBlocksOp
+dataconstructor http://www.gap-system.org/lib?oprt?Transitivity
+dataconstructor http://www.gap-system.org/lib?oprt?CanonicalRepresentativeOfExternalSet
+dataconstructor http://www.gap-system.org/lib?oprt?MaximalBlocksOp
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphism
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphism_st0
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphism_st1
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphism_st2
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphism_st3
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphism_st4
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphism_st5
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphism_st6
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphism_st7
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphism_st8
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphism_st9
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphism_st10
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphism_st11
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphism_st12
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphism_st13
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphism_st14
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphism_st15
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphism_st16
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphism_st17
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphism_st18
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphism_st19
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphism_st20
+dataconstructor http://www.gap-system.org/lib?oprt?IsBlocksHomomorphism
+dataconstructor http://www.gap-system.org/lib?oprt?IsBlocksHomomorphism_st0
+dataconstructor http://www.gap-system.org/lib?oprt?IsBlocksHomomorphism_st1
+dataconstructor http://www.gap-system.org/lib?oprt?IsBlocksHomomorphism_st2
+dataconstructor http://www.gap-system.org/lib?oprt?IsBlocksHomomorphism_st3
+dataconstructor http://www.gap-system.org/lib?oprt?IsBlocksHomomorphism_st4
+dataconstructor http://www.gap-system.org/lib?oprt?IsBlocksHomomorphism_st5
+dataconstructor http://www.gap-system.org/lib?oprt?IsBlocksHomomorphism_st6
+dataconstructor http://www.gap-system.org/lib?oprt?IsBlocksHomomorphism_st7
+dataconstructor http://www.gap-system.org/lib?oprt?IsBlocksHomomorphism_st8
+dataconstructor http://www.gap-system.org/lib?oprt?IsBlocksHomomorphism_st9
+dataconstructor http://www.gap-system.org/lib?oprt?IsBlocksHomomorphism_st10
+dataconstructor http://www.gap-system.org/lib?oprt?IsBlocksHomomorphism_st11
+dataconstructor http://www.gap-system.org/lib?oprt?IsBlocksHomomorphism_st12
+dataconstructor http://www.gap-system.org/lib?oprt?IsBlocksHomomorphism_st13
+dataconstructor http://www.gap-system.org/lib?oprt?IsBlocksHomomorphism_st14
+dataconstructor http://www.gap-system.org/lib?oprt?IsBlocksHomomorphism_st15
+dataconstructor http://www.gap-system.org/lib?oprt?IsBlocksHomomorphism_st16
+dataconstructor http://www.gap-system.org/lib?oprt?IsBlocksHomomorphism_st17
+dataconstructor http://www.gap-system.org/lib?oprt?IsBlocksHomomorphism_st18
+dataconstructor http://www.gap-system.org/lib?oprt?IsBlocksHomomorphism_st19
+dataconstructor http://www.gap-system.org/lib?oprt?IsBlocksHomomorphism_st20
+dataconstructor http://www.gap-system.org/lib?oprt?IsBlocksHomomorphism_st21
+dataconstructor http://www.gap-system.org/lib?oprt?IsExternalSetDefaultRep
+dataconstructor http://www.gap-system.org/lib?oprt?IsExternalSetDefaultRep_st0
+dataconstructor http://www.gap-system.org/lib?oprt?IsExternalSetDefaultRep_st1
+dataconstructor http://www.gap-system.org/lib?oprt?IsExternalSetDefaultRep_st2
+dataconstructor http://www.gap-system.org/lib?oprt?IsExternalSetDefaultRep_st3
+dataconstructor http://www.gap-system.org/lib?oprt?IsExternalSetDefaultRep_st4
+dataconstructor http://www.gap-system.org/lib?oprt?IsExternalSetDefaultRep_st5
+dataconstructor http://www.gap-system.org/lib?oprt?IsExternalSetDefaultRep_st6
+dataconstructor http://www.gap-system.org/lib?oprt?IsExternalSetDefaultRep_st7
+dataconstructor http://www.gap-system.org/lib?oprt?PermutationCycleOp
+dataconstructor http://www.gap-system.org/lib?oprt?IsExternalSubset
+dataconstructor http://www.gap-system.org/lib?oprt?IsExternalSubset_st0
+dataconstructor http://www.gap-system.org/lib?oprt?IsExternalSubset_st1
+dataconstructor http://www.gap-system.org/lib?oprt?IsExternalSubset_st2
+dataconstructor http://www.gap-system.org/lib?oprt?IsExternalSubset_st3
+dataconstructor http://www.gap-system.org/lib?oprt?IsExternalSubset_st4
+dataconstructor http://www.gap-system.org/lib?oprt?IsExternalSubset_st5
+dataconstructor http://www.gap-system.org/lib?oprt?IsExternalSubset_st6
+dataconstructor http://www.gap-system.org/lib?oprt?IsExternalSubset_st7
+dataconstructor http://www.gap-system.org/lib?oprt?IsExternalOrbit
+dataconstructor http://www.gap-system.org/lib?oprt?IsExternalOrbit_st0
+dataconstructor http://www.gap-system.org/lib?oprt?IsExternalOrbit_st1
+dataconstructor http://www.gap-system.org/lib?oprt?IsExternalOrbit_st2
+dataconstructor http://www.gap-system.org/lib?oprt?IsExternalOrbit_st3
+dataconstructor http://www.gap-system.org/lib?oprt?IsExternalOrbit_st4
+dataconstructor http://www.gap-system.org/lib?oprt?IsExternalOrbit_st5
+dataconstructor http://www.gap-system.org/lib?oprt?IsExternalOrbit_st6
+dataconstructor http://www.gap-system.org/lib?oprt?IsExternalOrbit_st7
+dataconstructor http://www.gap-system.org/lib?oprt?IsExternalOrbit_st8
+dataconstructor http://www.gap-system.org/lib?oprt?StabilizerFuncOp
+dataconstructor http://www.gap-system.org/lib?oprt?CycleIndexOp
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismSubset
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismSubset_st0
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismSubset_st1
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismSubset_st2
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismSubset_st3
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismSubset_st4
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismSubset_st5
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismSubset_st6
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismSubset_st7
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismSubset_st8
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismSubset_st9
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismSubset_st10
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismSubset_st11
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismSubset_st12
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismSubset_st13
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismSubset_st14
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismSubset_st15
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismSubset_st16
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismSubset_st17
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismSubset_st18
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismSubset_st19
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismSubset_st20
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismSubset_st21
+dataconstructor http://www.gap-system.org/lib?oprt?ActionKernelExternalSet
+dataconstructor http://www.gap-system.org/lib?oprt?RepresentativeActionOp
+dataconstructor http://www.gap-system.org/lib?oprt?OrbitOp
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismByBase
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismByBase_st0
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismByBase_st1
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismByBase_st2
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismByBase_st3
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismByBase_st4
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismByBase_st5
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismByBase_st6
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismByBase_st7
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismByBase_st8
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismByBase_st9
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismByBase_st10
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismByBase_st11
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismByBase_st12
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismByBase_st13
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismByBase_st14
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismByBase_st15
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismByBase_st16
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismByBase_st17
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismByBase_st18
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismByBase_st19
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismByBase_st20
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismByBase_st21
+dataconstructor http://www.gap-system.org/lib?oprt?BlocksOp
+dataconstructor http://www.gap-system.org/lib?oprt?RankAction
+dataconstructor http://www.gap-system.org/lib?oprt?ExternalOrbitsStabilizers
+dataconstructor http://www.gap-system.org/lib?oprt?CyclesOp
+dataconstructor http://www.gap-system.org/lib?oprt?OrbitLengths
+dataconstructor http://www.gap-system.org/lib?oprt?IsSemiRegular
+dataconstructor http://www.gap-system.org/lib?oprt?IsExternalSetByActorsRep
+dataconstructor http://www.gap-system.org/lib?oprt?IsExternalSetByActorsRep_st0
+dataconstructor http://www.gap-system.org/lib?oprt?IsExternalSetByActorsRep_st1
+dataconstructor http://www.gap-system.org/lib?oprt?IsExternalSetByActorsRep_st2
+dataconstructor http://www.gap-system.org/lib?oprt?IsExternalSetByActorsRep_st3
+dataconstructor http://www.gap-system.org/lib?oprt?IsExternalSetByActorsRep_st4
+dataconstructor http://www.gap-system.org/lib?oprt?IsExternalSetByActorsRep_st5
+dataconstructor http://www.gap-system.org/lib?oprt?IsExternalSetByActorsRep_st6
+dataconstructor http://www.gap-system.org/lib?oprt?IsExternalSetByActorsRep_st7
+dataconstructor http://www.gap-system.org/lib?oprt?BlocksAttr
+dataconstructor http://www.gap-system.org/lib?oprt?ActingDomain
+dataconstructor http://www.gap-system.org/lib?oprt?OrbitLengthsDomain
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismByActors
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismByActors_st0
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismByActors_st1
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismByActors_st2
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismByActors_st3
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismByActors_st4
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismByActors_st5
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismByActors_st6
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismByActors_st7
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismByActors_st8
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismByActors_st9
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismByActors_st10
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismByActors_st11
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismByActors_st12
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismByActors_st13
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismByActors_st14
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismByActors_st15
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismByActors_st16
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismByActors_st17
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismByActors_st18
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismByActors_st19
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismByActors_st20
+dataconstructor http://www.gap-system.org/lib?oprt?IsActionHomomorphismByActors_st21
+dataconstructor http://www.gap-system.org/lib?oprt?ExternalOrbitOp
+dataconstructor http://www.gap-system.org/lib?oprt?FunctionAction
+dataconstructor http://www.gap-system.org/lib?oprt?CanonicalRepresentativeDeterminatorOfExternalSet
+dataconstructor http://www.gap-system.org/lib?oprt?OrbitsDomain
+dataconstructor http://www.gap-system.org/lib?oprt?RestrictedExternalSet
+dataconstructor http://www.gap-system.org/lib?oprt?Earns
+dataconstructor http://www.gap-system.org/lib?oprt?Orbits
+dataconstructor http://www.gap-system.org/lib?oprt?OrbitStabilizerOp
+dataconstructor http://www.gap-system.org/lib?oprt?DomainForAction
+dataconstructor http://www.gap-system.org/lib?oprt?ExternalSet
+dataconstructor http://www.gap-system.org/lib?oprt?IsRegular
+dataconstructor http://www.gap-system.org/lib?oprt?StabilizerOfExternalSet
+dataconstructor http://www.gap-system.org/lib?oprt?IsProjectiveActionHomomorphism
+dataconstructor http://www.gap-system.org/lib?oprt?IsProjectiveActionHomomorphism_st0
+dataconstructor http://www.gap-system.org/lib?oprt?IsProjectiveActionHomomorphism_st1
+dataconstructor http://www.gap-system.org/lib?oprt?IsProjectiveActionHomomorphism_st2
+dataconstructor http://www.gap-system.org/lib?oprt?IsProjectiveActionHomomorphism_st3
+dataconstructor http://www.gap-system.org/lib?oprt?IsProjectiveActionHomomorphism_st4
+dataconstructor http://www.gap-system.org/lib?oprt?IsProjectiveActionHomomorphism_st5
+dataconstructor http://www.gap-system.org/lib?oprt?IsProjectiveActionHomomorphism_st6
+dataconstructor http://www.gap-system.org/lib?oprt?IsProjectiveActionHomomorphism_st7
+dataconstructor http://www.gap-system.org/lib?oprt?IsProjectiveActionHomomorphism_st8
+dataconstructor http://www.gap-system.org/lib?oprt?IsProjectiveActionHomomorphism_st9
+dataconstructor http://www.gap-system.org/lib?oprt?IsProjectiveActionHomomorphism_st10
+dataconstructor http://www.gap-system.org/lib?oprt?IsProjectiveActionHomomorphism_st11
+dataconstructor http://www.gap-system.org/lib?oprt?IsProjectiveActionHomomorphism_st12
+dataconstructor http://www.gap-system.org/lib?oprt?IsProjectiveActionHomomorphism_st13
+dataconstructor http://www.gap-system.org/lib?oprt?IsProjectiveActionHomomorphism_st14
+dataconstructor http://www.gap-system.org/lib?oprt?IsProjectiveActionHomomorphism_st15
+dataconstructor http://www.gap-system.org/lib?oprt?IsProjectiveActionHomomorphism_st16
+dataconstructor http://www.gap-system.org/lib?oprt?IsProjectiveActionHomomorphism_st17
+dataconstructor http://www.gap-system.org/lib?oprt?IsProjectiveActionHomomorphism_st18
+dataconstructor http://www.gap-system.org/lib?oprt?IsProjectiveActionHomomorphism_st19
+dataconstructor http://www.gap-system.org/lib?oprt?IsProjectiveActionHomomorphism_st20
+dataconstructor http://www.gap-system.org/lib?oprt?IsProjectiveActionHomomorphism_st21
+dataconstructor http://www.gap-system.org/lib?oprt?AbelianSubfactorAction
+dataconstructor http://www.gap-system.org/lib?oprt?IsLinearActionHomomorphism
+dataconstructor http://www.gap-system.org/lib?oprt?IsLinearActionHomomorphism_st0
+dataconstructor http://www.gap-system.org/lib?oprt?IsLinearActionHomomorphism_st1
+dataconstructor http://www.gap-system.org/lib?oprt?IsLinearActionHomomorphism_st2
+dataconstructor http://www.gap-system.org/lib?oprt?IsLinearActionHomomorphism_st3
+dataconstructor http://www.gap-system.org/lib?oprt?IsLinearActionHomomorphism_st4
+dataconstructor http://www.gap-system.org/lib?oprt?IsLinearActionHomomorphism_st5
+dataconstructor http://www.gap-system.org/lib?oprt?IsLinearActionHomomorphism_st6
+dataconstructor http://www.gap-system.org/lib?oprt?IsLinearActionHomomorphism_st7
+dataconstructor http://www.gap-system.org/lib?oprt?IsLinearActionHomomorphism_st8
+dataconstructor http://www.gap-system.org/lib?oprt?IsLinearActionHomomorphism_st9
+dataconstructor http://www.gap-system.org/lib?oprt?IsLinearActionHomomorphism_st10
+dataconstructor http://www.gap-system.org/lib?oprt?IsLinearActionHomomorphism_st11
+dataconstructor http://www.gap-system.org/lib?oprt?IsLinearActionHomomorphism_st12
+dataconstructor http://www.gap-system.org/lib?oprt?IsLinearActionHomomorphism_st13
+dataconstructor http://www.gap-system.org/lib?oprt?IsLinearActionHomomorphism_st14
+dataconstructor http://www.gap-system.org/lib?oprt?IsLinearActionHomomorphism_st15
+dataconstructor http://www.gap-system.org/lib?oprt?IsLinearActionHomomorphism_st16
+dataconstructor http://www.gap-system.org/lib?oprt?IsLinearActionHomomorphism_st17
+dataconstructor http://www.gap-system.org/lib?oprt?IsLinearActionHomomorphism_st18
+dataconstructor http://www.gap-system.org/lib?oprt?IsLinearActionHomomorphism_st19
+dataconstructor http://www.gap-system.org/lib?oprt?IsLinearActionHomomorphism_st20
+dataconstructor http://www.gap-system.org/lib?oprt?IsLinearActionHomomorphism_st21
+dataconstructor http://www.gap-system.org/lib?oprt?ActionHomomorphismAttr
+dataconstructor http://www.gap-system.org/lib?oprt?LinearActionBasis
+dataconstructor http://www.gap-system.org/lib?oprt?RepresentativesMinimalBlocksAttr
+dataconstructor http://www.gap-system.org/lib?oprt?CycleLengthOp
+dataconstructor http://www.gap-system.org/lib?oprt?SortedSparseActionHomomorphismOp
+dataconstructor http://www.gap-system.org/lib?oprt?CycleOp
+dataconstructor http://www.gap-system.org/lib?oprt?OrbitLengthOp
+dataconstructor http://www.gap-system.org/lib?oprt?CycleLengthsOp
+dataconstructor http://www.gap-system.org/lib?oprt?PreOrbishProcessing
+dataconstructor http://www.gap-system.org/lib?oprt?ActorOfExternalSet
+dataconstructor http://www.gap-system.org/lib?oprt?HomeEnumerator
+dataconstructor http://www.gap-system.org/lib?oprt?ExternalOrbits
+dataconstructor http://www.gap-system.org/lib?oprt?OrbitStabilizerAlgorithm
+dataconstructor http://www.gap-system.org/lib?oprt?SparseActionHomomorphismOp
+dataconstructor http://www.gap-system.org/lib?oprt?IsPrimitiveAffine
+dataconstructor http://www.gap-system.org/lib?oprt?IsExternalSetByPcgs
+dataconstructor http://www.gap-system.org/lib?oprt?IsExternalSetByPcgs_st0
+dataconstructor http://www.gap-system.org/lib?oprt?IsExternalSetByPcgs_st1
+dataconstructor http://www.gap-system.org/lib?oprt?IsExternalSetByPcgs_st2
+dataconstructor http://www.gap-system.org/lib?oprt?IsExternalSetByPcgs_st3
+dataconstructor http://www.gap-system.org/lib?oprt?IsExternalSetByPcgs_st4
+dataconstructor http://www.gap-system.org/lib?oprt?IsExternalSetByPcgs_st5
+dataconstructor http://www.gap-system.org/lib?oprt?IsConstituentHomomorphism
+dataconstructor http://www.gap-system.org/lib?oprt?IsConstituentHomomorphism_st0
+dataconstructor http://www.gap-system.org/lib?oprt?IsConstituentHomomorphism_st1
+dataconstructor http://www.gap-system.org/lib?oprt?IsConstituentHomomorphism_st2
+dataconstructor http://www.gap-system.org/lib?oprt?IsConstituentHomomorphism_st3
+dataconstructor http://www.gap-system.org/lib?oprt?IsConstituentHomomorphism_st4
+dataconstructor http://www.gap-system.org/lib?oprt?IsConstituentHomomorphism_st5
+dataconstructor http://www.gap-system.org/lib?oprt?IsConstituentHomomorphism_st6
+dataconstructor http://www.gap-system.org/lib?oprt?IsConstituentHomomorphism_st7
+dataconstructor http://www.gap-system.org/lib?oprt?IsConstituentHomomorphism_st8
+dataconstructor http://www.gap-system.org/lib?oprt?IsConstituentHomomorphism_st9
+dataconstructor http://www.gap-system.org/lib?oprt?IsConstituentHomomorphism_st10
+dataconstructor http://www.gap-system.org/lib?oprt?IsConstituentHomomorphism_st11
+dataconstructor http://www.gap-system.org/lib?oprt?IsConstituentHomomorphism_st12
+dataconstructor http://www.gap-system.org/lib?oprt?IsConstituentHomomorphism_st13
+dataconstructor http://www.gap-system.org/lib?oprt?IsConstituentHomomorphism_st14
+dataconstructor http://www.gap-system.org/lib?oprt?IsConstituentHomomorphism_st15
+dataconstructor http://www.gap-system.org/lib?oprt?IsConstituentHomomorphism_st16
+dataconstructor http://www.gap-system.org/lib?oprt?IsConstituentHomomorphism_st17
+dataconstructor http://www.gap-system.org/lib?oprt?IsConstituentHomomorphism_st18
+dataconstructor http://www.gap-system.org/lib?oprt?IsConstituentHomomorphism_st19
+dataconstructor http://www.gap-system.org/lib?oprt?IsConstituentHomomorphism_st20
+dataconstructor http://www.gap-system.org/lib?oprt?IsConstituentHomomorphism_st21
+dataconstructor http://www.gap-system.org/lib?oprt?SurjectiveActionHomomorphismAttr
+dataconstructor http://www.gap-system.org/lib?oprt?UnderlyingExternalSet
+dataconstructor http://www.gap-system.org/lib?oprt?MaximalBlocksAttr
+dataconstructor http://www.gap-system.org/lib?oprt?ExternalSubsetOp
+dataconstructor http://www.gap-system.org/lib?oprt?IsPrimitive
+dataconstructor http://www.gap-system.org/lib?oprt?CanEasilyDetermineCanonicalRepresentativeExternalSet
 theory http://www.gap-system.org/lib?oprt
 HasMeta http://www.gap-system.org/lib?oprt http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?oprt http://www.gap-system.org/lib?list
@@ -454,7 +742,6 @@ Declares http://www.gap-system.org/lib?oprt http://www.gap-system.org/lib?oprt?I
 constant http://www.gap-system.org/lib?oprt?IsExternalSet_st3
 Declares http://www.gap-system.org/lib?oprt http://www.gap-system.org/lib?oprt?IsExternalSet_st4
 constant http://www.gap-system.org/lib?oprt?IsExternalSet_st4
-Includes http://www.gap-system.org/lib?oprt http://www.gap-system.org/lib?oprt
 Includes http://www.gap-system.org/lib?oprt http://www.gap-system.org/lib?magma
 Includes http://www.gap-system.org/lib?oprt http://www.gap-system.org/lib?ctblfuns
 Includes http://www.gap-system.org/lib?oprt http://www.gap-system.org/lib?ctbl
diff --git a/relational/http..www.gap-system.org/lib/oprtglat.rel b/relational/http..www.gap-system.org/lib/oprtglat.rel
index dec45d52e1d4014112b1443340088bbe53791c92..d2c712499c0bca8b3b73036dec77b6d91fedb34f 100644
--- a/relational/http..www.gap-system.org/lib/oprtglat.rel
+++ b/relational/http..www.gap-system.org/lib/oprtglat.rel
@@ -2,6 +2,7 @@ IsAttribute http://www.gap-system.org/lib?oprtglat?SubgroupsOrbitsAndNormalizers
 implies http://www.gap-system.org/lib?oprtglat?SubgroupsOrbitsAndNormalizers http://www.gap-system.org/lib?magma?IsMagmaWithInverses
 implies http://www.gap-system.org/lib?oprtglat?SubgroupsOrbitsAndNormalizers http://www.gap-system.org/lib?magma?IsAssociative
 implies http://www.gap-system.org/lib?oprtglat?SubgroupsOrbitsAndNormalizers http://www.gap-system.org/?Types?IsBool
+dataconstructor http://www.gap-system.org/lib?oprtglat?SubgroupsOrbitsAndNormalizers
 theory http://www.gap-system.org/lib?oprtglat
 HasMeta http://www.gap-system.org/lib?oprtglat http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?oprtglat http://www.gap-system.org/lib?magma
diff --git a/relational/http..www.gap-system.org/lib/orders.rel b/relational/http..www.gap-system.org/lib/orders.rel
index cbfe654465ea7f451f31a340225abd026be09211..e3fa7aeaf505d852acaabfbc0324aadea1069662 100644
--- a/relational/http..www.gap-system.org/lib/orders.rel
+++ b/relational/http..www.gap-system.org/lib/orders.rel
@@ -74,6 +74,34 @@ IsAttribute http://www.gap-system.org/lib?orders?BasicWreathProductOrdering
 implies http://www.gap-system.org/lib?orders?BasicWreathProductOrdering http://www.gap-system.org/lib?word?IsWord
 implies http://www.gap-system.org/lib?orders?BasicWreathProductOrdering http://www.gap-system.org/lib?arith?IsAssociativeElement
 implies http://www.gap-system.org/lib?orders?BasicWreathProductOrdering http://www.gap-system.org/lib?list?IsList
+dataconstructor http://www.gap-system.org/lib?orders?WreathProductOrdering
+dataconstructor http://www.gap-system.org/lib?orders?IsOrdering
+dataconstructor http://www.gap-system.org/lib?orders?LessThanFunction
+dataconstructor http://www.gap-system.org/lib?orders?IsOrderingOnFamilyOfAssocWords
+dataconstructor http://www.gap-system.org/lib?orders?OrderingOnGenerators
+dataconstructor http://www.gap-system.org/lib?orders?IsTotalOrdering
+dataconstructor http://www.gap-system.org/lib?orders?IsShortLexOrdering
+dataconstructor http://www.gap-system.org/lib?orders?IsLessThanOrEqualUnder
+dataconstructor http://www.gap-system.org/lib?orders?OrderingByLessThanFunctionNC
+dataconstructor http://www.gap-system.org/lib?orders?IsWellFoundedOrdering
+dataconstructor http://www.gap-system.org/lib?orders?IsTranslationInvariantOrdering
+dataconstructor http://www.gap-system.org/lib?orders?IsReductionOrdering
+dataconstructor http://www.gap-system.org/lib?orders?OrderingByLessThanOrEqualFunctionNC
+dataconstructor http://www.gap-system.org/lib?orders?IsLessThanUnder
+dataconstructor http://www.gap-system.org/lib?orders?OrderingsFamily
+dataconstructor http://www.gap-system.org/lib?orders?IsBasicWreathProductOrdering
+dataconstructor http://www.gap-system.org/lib?orders?IsIncomparableUnder
+dataconstructor http://www.gap-system.org/lib?orders?IsWeightLexOrdering
+dataconstructor http://www.gap-system.org/lib?orders?LexicographicOrdering
+dataconstructor http://www.gap-system.org/lib?orders?IsWreathProductOrdering
+dataconstructor http://www.gap-system.org/lib?orders?LevelsOfGenerators
+dataconstructor http://www.gap-system.org/lib?orders?ShortLexOrdering
+dataconstructor http://www.gap-system.org/lib?orders?LetterRepWordsLessFunc
+dataconstructor http://www.gap-system.org/lib?orders?FamilyForOrdering
+dataconstructor http://www.gap-system.org/lib?orders?WeightOfGenerators
+dataconstructor http://www.gap-system.org/lib?orders?LessThanOrEqualFunction
+dataconstructor http://www.gap-system.org/lib?orders?WeightLexOrdering
+dataconstructor http://www.gap-system.org/lib?orders?BasicWreathProductOrdering
 theory http://www.gap-system.org/lib?orders
 HasMeta http://www.gap-system.org/lib?orders http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?orders http://www.gap-system.org/lib?type
@@ -82,7 +110,6 @@ Declares http://www.gap-system.org/lib?orders http://www.gap-system.org/lib?orde
 constant http://www.gap-system.org/lib?orders?WreathProductOrdering
 Declares http://www.gap-system.org/lib?orders http://www.gap-system.org/lib?orders?IsOrdering
 constant http://www.gap-system.org/lib?orders?IsOrdering
-Includes http://www.gap-system.org/lib?orders http://www.gap-system.org/lib?orders
 Declares http://www.gap-system.org/lib?orders http://www.gap-system.org/lib?orders?LessThanFunction
 constant http://www.gap-system.org/lib?orders?LessThanFunction
 Declares http://www.gap-system.org/lib?orders http://www.gap-system.org/lib?orders?IsOrderingOnFamilyOfAssocWords
diff --git a/relational/http..www.gap-system.org/lib/other.rel b/relational/http..www.gap-system.org/lib/other.rel
index 9482e430190e3bad4d1ae1ba78b91fd27b9ea936..8bd932d6e9192beac019931a28711b2387a9615f 100644
--- a/relational/http..www.gap-system.org/lib/other.rel
+++ b/relational/http..www.gap-system.org/lib/other.rel
@@ -1,5 +1,6 @@
 IsAttribute http://www.gap-system.org/lib?other?MagmaInputString
 implies http://www.gap-system.org/lib?other?MagmaInputString http://www.gap-system.org/lib?string?IsString
+dataconstructor http://www.gap-system.org/lib?other?MagmaInputString
 theory http://www.gap-system.org/lib?other
 HasMeta http://www.gap-system.org/lib?other http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?other http://www.gap-system.org/lib?string
diff --git a/relational/http..www.gap-system.org/lib/overload.rel b/relational/http..www.gap-system.org/lib/overload.rel
index d62fd6e7eb1fc09930a994a403cfb5d0327f5d26..2b506a8025aa772cf87c7b9a8741770ff78feb0b 100644
--- a/relational/http..www.gap-system.org/lib/overload.rel
+++ b/relational/http..www.gap-system.org/lib/overload.rel
@@ -15,6 +15,23 @@ IsAttribute http://www.gap-system.org/lib?overload?IsSporadicSimple
 IsAttribute http://www.gap-system.org/lib?overload?IsNilpotent
 IsAttribute http://www.gap-system.org/lib?overload?LowerCentralSeries
 IsAttribute http://www.gap-system.org/lib?overload?UpperCentralSeries
+dataconstructor http://www.gap-system.org/lib?overload?DerivedSeries
+dataconstructor http://www.gap-system.org/lib?overload?Determinant
+dataconstructor http://www.gap-system.org/lib?overload?Kernel
+dataconstructor http://www.gap-system.org/lib?overload?IsMonomial
+dataconstructor http://www.gap-system.org/lib?overload?IsSimple
+dataconstructor http://www.gap-system.org/lib?overload?Degree
+dataconstructor http://www.gap-system.org/lib?overload?CoKernel
+dataconstructor http://www.gap-system.org/lib?overload?IsSolvable
+dataconstructor http://www.gap-system.org/lib?overload?Rank
+dataconstructor http://www.gap-system.org/lib?overload?IsIrreducible
+dataconstructor http://www.gap-system.org/lib?overload?IsPerfect
+dataconstructor http://www.gap-system.org/lib?overload?IsSupersolvable
+dataconstructor http://www.gap-system.org/lib?overload?IsAlmostSimple
+dataconstructor http://www.gap-system.org/lib?overload?IsSporadicSimple
+dataconstructor http://www.gap-system.org/lib?overload?IsNilpotent
+dataconstructor http://www.gap-system.org/lib?overload?LowerCentralSeries
+dataconstructor http://www.gap-system.org/lib?overload?UpperCentralSeries
 theory http://www.gap-system.org/lib?overload
 HasMeta http://www.gap-system.org/lib?overload http://www.gap-system.org/?Types
 Declares http://www.gap-system.org/lib?overload http://www.gap-system.org/lib?overload?DerivedSeries
diff --git a/relational/http..www.gap-system.org/lib/padics.rel b/relational/http..www.gap-system.org/lib/padics.rel
index 58c446e0a2907319a372b634e24ef05c6b40144d..d1661f95aa984beb77b86a95a1987fd7ffa5da1f 100644
--- a/relational/http..www.gap-system.org/lib/padics.rel
+++ b/relational/http..www.gap-system.org/lib/padics.rel
@@ -51,6 +51,52 @@ implies http://www.gap-system.org/lib?padics?IsPadicExtensionNumber_st12 http://
 implies http://www.gap-system.org/lib?padics?IsPadicExtensionNumber_st12 http://www.gap-system.org/lib?arith?IsAssociativeElement
 implies http://www.gap-system.org/lib?padics?IsPadicExtensionNumber_st12 http://www.gap-system.org/lib?arith?IsCommutativeElement
 implies http://www.gap-system.org/lib?padics?IsPadicExtensionNumber_st12 http://www.gap-system.org/lib?padics?IsPadicNumber
+dataconstructor http://www.gap-system.org/lib?padics?IsPadicNumber
+dataconstructor http://www.gap-system.org/lib?padics?IsPadicNumber_st0
+dataconstructor http://www.gap-system.org/lib?padics?IsPadicNumber_st1
+dataconstructor http://www.gap-system.org/lib?padics?IsPadicNumber_st2
+dataconstructor http://www.gap-system.org/lib?padics?IsPadicNumber_st3
+dataconstructor http://www.gap-system.org/lib?padics?IsPadicNumber_st4
+dataconstructor http://www.gap-system.org/lib?padics?IsPadicNumber_st5
+dataconstructor http://www.gap-system.org/lib?padics?IsPadicNumber_st6
+dataconstructor http://www.gap-system.org/lib?padics?IsPadicNumber_st7
+dataconstructor http://www.gap-system.org/lib?padics?IsPadicNumber_st8
+dataconstructor http://www.gap-system.org/lib?padics?IsPadicNumber_st9
+dataconstructor http://www.gap-system.org/lib?padics?IsPadicNumber_st10
+dataconstructor http://www.gap-system.org/lib?padics?IsPadicNumber_st11
+dataconstructor http://www.gap-system.org/lib?padics?IsPadicNumberList
+dataconstructor http://www.gap-system.org/lib?padics?IsPadicNumberTable
+dataconstructor http://www.gap-system.org/lib?padics?ShiftedPadicNumber
+dataconstructor http://www.gap-system.org/lib?padics?PadicNumber
+dataconstructor http://www.gap-system.org/lib?padics?IsPurePadicNumber
+dataconstructor http://www.gap-system.org/lib?padics?IsPurePadicNumber_st0
+dataconstructor http://www.gap-system.org/lib?padics?IsPurePadicNumber_st1
+dataconstructor http://www.gap-system.org/lib?padics?IsPurePadicNumber_st2
+dataconstructor http://www.gap-system.org/lib?padics?IsPurePadicNumber_st3
+dataconstructor http://www.gap-system.org/lib?padics?IsPurePadicNumber_st4
+dataconstructor http://www.gap-system.org/lib?padics?IsPurePadicNumber_st5
+dataconstructor http://www.gap-system.org/lib?padics?IsPurePadicNumber_st6
+dataconstructor http://www.gap-system.org/lib?padics?IsPurePadicNumber_st7
+dataconstructor http://www.gap-system.org/lib?padics?IsPurePadicNumber_st8
+dataconstructor http://www.gap-system.org/lib?padics?IsPurePadicNumber_st9
+dataconstructor http://www.gap-system.org/lib?padics?IsPurePadicNumber_st10
+dataconstructor http://www.gap-system.org/lib?padics?IsPurePadicNumber_st11
+dataconstructor http://www.gap-system.org/lib?padics?IsPurePadicNumber_st12
+dataconstructor http://www.gap-system.org/lib?padics?Valuation
+dataconstructor http://www.gap-system.org/lib?padics?IsPadicExtensionNumber
+dataconstructor http://www.gap-system.org/lib?padics?IsPadicExtensionNumber_st0
+dataconstructor http://www.gap-system.org/lib?padics?IsPadicExtensionNumber_st1
+dataconstructor http://www.gap-system.org/lib?padics?IsPadicExtensionNumber_st2
+dataconstructor http://www.gap-system.org/lib?padics?IsPadicExtensionNumber_st3
+dataconstructor http://www.gap-system.org/lib?padics?IsPadicExtensionNumber_st4
+dataconstructor http://www.gap-system.org/lib?padics?IsPadicExtensionNumber_st5
+dataconstructor http://www.gap-system.org/lib?padics?IsPadicExtensionNumber_st6
+dataconstructor http://www.gap-system.org/lib?padics?IsPadicExtensionNumber_st7
+dataconstructor http://www.gap-system.org/lib?padics?IsPadicExtensionNumber_st8
+dataconstructor http://www.gap-system.org/lib?padics?IsPadicExtensionNumber_st9
+dataconstructor http://www.gap-system.org/lib?padics?IsPadicExtensionNumber_st10
+dataconstructor http://www.gap-system.org/lib?padics?IsPadicExtensionNumber_st11
+dataconstructor http://www.gap-system.org/lib?padics?IsPadicExtensionNumber_st12
 theory http://www.gap-system.org/lib?padics
 HasMeta http://www.gap-system.org/lib?padics http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?padics http://www.gap-system.org/lib?arith
@@ -81,7 +127,6 @@ constant http://www.gap-system.org/lib?padics?IsPadicNumber_st10
 Declares http://www.gap-system.org/lib?padics http://www.gap-system.org/lib?padics?IsPadicNumber_st11
 constant http://www.gap-system.org/lib?padics?IsPadicNumber_st11
 Includes http://www.gap-system.org/lib?padics http://www.gap-system.org/lib?list
-Includes http://www.gap-system.org/lib?padics http://www.gap-system.org/lib?padics
 Declares http://www.gap-system.org/lib?padics http://www.gap-system.org/lib?padics?IsPadicNumberList
 constant http://www.gap-system.org/lib?padics?IsPadicNumberList
 Declares http://www.gap-system.org/lib?padics http://www.gap-system.org/lib?padics?IsPadicNumberTable
diff --git a/relational/http..www.gap-system.org/lib/pcgs.rel b/relational/http..www.gap-system.org/lib/pcgs.rel
index 222b5b59dc5964dc79cfdbf9d5bf8d5f308e5a55..8d403d8faba923bae153470f5d0cd52edd2e6185 100644
--- a/relational/http..www.gap-system.org/lib/pcgs.rel
+++ b/relational/http..www.gap-system.org/lib/pcgs.rel
@@ -188,6 +188,131 @@ implies http://www.gap-system.org/lib?pcgs?SumFactorizationFunctionPcgs http://w
 IsAttribute http://www.gap-system.org/lib?pcgs?PcgsByPcSequenceCons
 implies http://www.gap-system.org/lib?pcgs?PcgsByPcSequenceCons http://www.gap-system.org/lib?type?IsFamily
 implies http://www.gap-system.org/lib?pcgs?PcgsByPcSequenceCons http://www.gap-system.org/lib?list?IsList
+dataconstructor http://www.gap-system.org/lib?pcgs?IsPcgsDefaultRep
+dataconstructor http://www.gap-system.org/lib?pcgs?IsPcgsDefaultRep_st0
+dataconstructor http://www.gap-system.org/lib?pcgs?IsPcgsDefaultRep_st1
+dataconstructor http://www.gap-system.org/lib?pcgs?IsGeneralPcgs
+dataconstructor http://www.gap-system.org/lib?pcgs?IsGeneralPcgs_st0
+dataconstructor http://www.gap-system.org/lib?pcgs?IsGeneralPcgs_st1
+dataconstructor http://www.gap-system.org/lib?pcgs?IsGeneralPcgs_st2
+dataconstructor http://www.gap-system.org/lib?pcgs?IsGeneralPcgs_st3
+dataconstructor http://www.gap-system.org/lib?pcgs?IsGeneralPcgs_st4
+dataconstructor http://www.gap-system.org/lib?pcgs?IsGeneralPcgs_st5
+dataconstructor http://www.gap-system.org/lib?pcgs?IsGeneralPcgs_st6
+dataconstructor http://www.gap-system.org/lib?pcgs?IsGeneralPcgs_st7
+dataconstructor http://www.gap-system.org/lib?pcgs?IsGeneralPcgs_st8
+dataconstructor http://www.gap-system.org/lib?pcgs?IsGeneralPcgs_st9
+dataconstructor http://www.gap-system.org/lib?pcgs?IsGeneralPcgs_st10
+dataconstructor http://www.gap-system.org/lib?pcgs?IsGeneralPcgs_st11
+dataconstructor http://www.gap-system.org/lib?pcgs?IsGeneralPcgs_st12
+dataconstructor http://www.gap-system.org/lib?pcgs?IsGeneralPcgs_st13
+dataconstructor http://www.gap-system.org/lib?pcgs?IsGeneralPcgs_st14
+dataconstructor http://www.gap-system.org/lib?pcgs?IsGeneralPcgs_st15
+dataconstructor http://www.gap-system.org/lib?pcgs?IsGeneralPcgs_st16
+dataconstructor http://www.gap-system.org/lib?pcgs?IsGeneralPcgs_st17
+dataconstructor http://www.gap-system.org/lib?pcgs?IsFiniteOrdersPcgs
+dataconstructor http://www.gap-system.org/lib?pcgs?IsModuloPcgs
+dataconstructor http://www.gap-system.org/lib?pcgs?IsModuloPcgs_st0
+dataconstructor http://www.gap-system.org/lib?pcgs?IsModuloPcgs_st1
+dataconstructor http://www.gap-system.org/lib?pcgs?IsModuloPcgs_st2
+dataconstructor http://www.gap-system.org/lib?pcgs?IsModuloPcgs_st3
+dataconstructor http://www.gap-system.org/lib?pcgs?IsModuloPcgs_st4
+dataconstructor http://www.gap-system.org/lib?pcgs?IsModuloPcgs_st5
+dataconstructor http://www.gap-system.org/lib?pcgs?IsModuloPcgs_st6
+dataconstructor http://www.gap-system.org/lib?pcgs?IsModuloPcgs_st7
+dataconstructor http://www.gap-system.org/lib?pcgs?IsModuloPcgs_st8
+dataconstructor http://www.gap-system.org/lib?pcgs?IsModuloPcgs_st9
+dataconstructor http://www.gap-system.org/lib?pcgs?IsModuloPcgs_st10
+dataconstructor http://www.gap-system.org/lib?pcgs?IsModuloPcgs_st11
+dataconstructor http://www.gap-system.org/lib?pcgs?IsModuloPcgs_st12
+dataconstructor http://www.gap-system.org/lib?pcgs?IsModuloPcgs_st13
+dataconstructor http://www.gap-system.org/lib?pcgs?IsModuloPcgs_st14
+dataconstructor http://www.gap-system.org/lib?pcgs?IsModuloPcgs_st15
+dataconstructor http://www.gap-system.org/lib?pcgs?IsModuloPcgs_st16
+dataconstructor http://www.gap-system.org/lib?pcgs?IsModuloPcgs_st17
+dataconstructor http://www.gap-system.org/lib?pcgs?IsModuloPcgs_st18
+dataconstructor http://www.gap-system.org/lib?pcgs?NormalIntersectionPcgs
+dataconstructor http://www.gap-system.org/lib?pcgs?IsPcgs
+dataconstructor http://www.gap-system.org/lib?pcgs?IsPcgs_st0
+dataconstructor http://www.gap-system.org/lib?pcgs?IsPcgs_st1
+dataconstructor http://www.gap-system.org/lib?pcgs?IsPcgs_st2
+dataconstructor http://www.gap-system.org/lib?pcgs?IsPcgs_st3
+dataconstructor http://www.gap-system.org/lib?pcgs?IsPcgs_st4
+dataconstructor http://www.gap-system.org/lib?pcgs?IsPcgs_st5
+dataconstructor http://www.gap-system.org/lib?pcgs?IsPcgs_st6
+dataconstructor http://www.gap-system.org/lib?pcgs?IsPcgs_st7
+dataconstructor http://www.gap-system.org/lib?pcgs?IsPcgs_st8
+dataconstructor http://www.gap-system.org/lib?pcgs?IsPcgs_st9
+dataconstructor http://www.gap-system.org/lib?pcgs?IsPcgs_st10
+dataconstructor http://www.gap-system.org/lib?pcgs?IsPcgs_st11
+dataconstructor http://www.gap-system.org/lib?pcgs?IsPcgs_st12
+dataconstructor http://www.gap-system.org/lib?pcgs?IsPcgs_st13
+dataconstructor http://www.gap-system.org/lib?pcgs?IsPcgs_st14
+dataconstructor http://www.gap-system.org/lib?pcgs?IsPcgs_st15
+dataconstructor http://www.gap-system.org/lib?pcgs?IsPcgs_st16
+dataconstructor http://www.gap-system.org/lib?pcgs?IsPcgs_st17
+dataconstructor http://www.gap-system.org/lib?pcgs?IsPcgs_st18
+dataconstructor http://www.gap-system.org/lib?pcgs?IsPcgs_st19
+dataconstructor http://www.gap-system.org/lib?pcgs?ExtendedPcgs
+dataconstructor http://www.gap-system.org/lib?pcgs?CleanedTailPcElement
+dataconstructor http://www.gap-system.org/lib?pcgs?IsPcgsFamily
+dataconstructor http://www.gap-system.org/lib?pcgs?IsPcgsFamily_st0
+dataconstructor http://www.gap-system.org/lib?pcgs?PcGroupWithPcgs
+dataconstructor http://www.gap-system.org/lib?pcgs?PcSeries
+dataconstructor http://www.gap-system.org/lib?pcgs?ExponentsOfConjugate
+dataconstructor http://www.gap-system.org/lib?pcgs?SumOfPcElement
+dataconstructor http://www.gap-system.org/lib?pcgs?HeadPcElementByNumber
+dataconstructor http://www.gap-system.org/lib?pcgs?PCentralNormalSeriesByPcgsPGroup
+dataconstructor http://www.gap-system.org/lib?pcgs?ExponentsOfPcElement
+dataconstructor http://www.gap-system.org/lib?pcgs?GroupOfPcgs
+dataconstructor http://www.gap-system.org/lib?pcgs?ChiefNormalSeriesByPcgs
+dataconstructor http://www.gap-system.org/lib?pcgs?LeadingExponentOfPcElement
+dataconstructor http://www.gap-system.org/lib?pcgs?CentralNormalSeriesByPcgs
+dataconstructor http://www.gap-system.org/lib?pcgs?NormalSeriesByPcgs
+dataconstructor http://www.gap-system.org/lib?pcgs?ExponentsOfRelativePower
+dataconstructor http://www.gap-system.org/lib?pcgs?IsEnumeratorByPcgsRep
+dataconstructor http://www.gap-system.org/lib?pcgs?IsEnumeratorByPcgsRep_st0
+dataconstructor http://www.gap-system.org/lib?pcgs?IsEnumeratorByPcgsRep_st1
+dataconstructor http://www.gap-system.org/lib?pcgs?IndicesPCentralNormalStepsPGroup
+dataconstructor http://www.gap-system.org/lib?pcgs?RefinedPcGroup
+dataconstructor http://www.gap-system.org/lib?pcgs?DepthAndLeadingExponentOfPcElement
+dataconstructor http://www.gap-system.org/lib?pcgs?OneOfPcgs
+dataconstructor http://www.gap-system.org/lib?pcgs?IsPcgsChiefSeries
+dataconstructor http://www.gap-system.org/lib?pcgs?PcgsPCentralSeriesPGroup
+dataconstructor http://www.gap-system.org/lib?pcgs?IntersectionSumPcgs
+dataconstructor http://www.gap-system.org/lib?pcgs?ExponentOfPcElement
+dataconstructor http://www.gap-system.org/lib?pcgs?IsPcgsByPcgsRep
+dataconstructor http://www.gap-system.org/lib?pcgs?IsPcgsByPcgsRep_st0
+dataconstructor http://www.gap-system.org/lib?pcgs?IsPcgsByPcgsRep_st1
+dataconstructor http://www.gap-system.org/lib?pcgs?IsPcgsByPcgsRep_st2
+dataconstructor http://www.gap-system.org/lib?pcgs?IsPcgsByPcgsRep_st3
+dataconstructor http://www.gap-system.org/lib?pcgs?IsPcgsByPcgsRep_st4
+dataconstructor http://www.gap-system.org/lib?pcgs?IndicesEANormalSteps
+dataconstructor http://www.gap-system.org/lib?pcgs?ExtendedIntersectionSumPcgs
+dataconstructor http://www.gap-system.org/lib?pcgs?IsPcgsElementaryAbelianSeries
+dataconstructor http://www.gap-system.org/lib?pcgs?RelativeOrderOfPcElement
+dataconstructor http://www.gap-system.org/lib?pcgs?IndicesCentralNormalSteps
+dataconstructor http://www.gap-system.org/lib?pcgs?PcgsElementaryAbelianSeries
+dataconstructor http://www.gap-system.org/lib?pcgs?PcgsByPcSequenceNC
+dataconstructor http://www.gap-system.org/lib?pcgs?IndicesNormalSteps
+dataconstructor http://www.gap-system.org/lib?pcgs?ReducedPcElement
+dataconstructor http://www.gap-system.org/lib?pcgs?IsPrimeOrdersPcgs
+dataconstructor http://www.gap-system.org/lib?pcgs?PcgsByPcSequence
+dataconstructor http://www.gap-system.org/lib?pcgs?IndicesChiefNormalSteps
+dataconstructor http://www.gap-system.org/lib?pcgs?IsPcgsCentralSeries
+dataconstructor http://www.gap-system.org/lib?pcgs?EANormalSeriesByPcgs
+dataconstructor http://www.gap-system.org/lib?pcgs?PcElementByExponentsNC
+dataconstructor http://www.gap-system.org/lib?pcgs?EnumeratorByPcgs
+dataconstructor http://www.gap-system.org/lib?pcgs?PcgsChiefSeries
+dataconstructor http://www.gap-system.org/lib?pcgs?IsomorphismRefinedPcGroup
+dataconstructor http://www.gap-system.org/lib?pcgs?DifferenceOfPcElement
+dataconstructor http://www.gap-system.org/lib?pcgs?IsPcgsPCentralSeriesPGroup
+dataconstructor http://www.gap-system.org/lib?pcgs?PcgsCentralSeries
+dataconstructor http://www.gap-system.org/lib?pcgs?SumPcgs
+dataconstructor http://www.gap-system.org/lib?pcgs?DepthOfPcElement
+dataconstructor http://www.gap-system.org/lib?pcgs?ExponentsOfCommutator
+dataconstructor http://www.gap-system.org/lib?pcgs?SumFactorizationFunctionPcgs
+dataconstructor http://www.gap-system.org/lib?pcgs?PcgsByPcSequenceCons
 theory http://www.gap-system.org/lib?pcgs
 HasMeta http://www.gap-system.org/lib?pcgs http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?pcgs http://www.gap-system.org/lib?type
@@ -239,7 +364,6 @@ Declares http://www.gap-system.org/lib?pcgs http://www.gap-system.org/lib?pcgs?I
 constant http://www.gap-system.org/lib?pcgs?IsGeneralPcgs_st16
 Declares http://www.gap-system.org/lib?pcgs http://www.gap-system.org/lib?pcgs?IsGeneralPcgs_st17
 constant http://www.gap-system.org/lib?pcgs?IsGeneralPcgs_st17
-Includes http://www.gap-system.org/lib?pcgs http://www.gap-system.org/lib?pcgs
 Declares http://www.gap-system.org/lib?pcgs http://www.gap-system.org/lib?pcgs?IsFiniteOrdersPcgs
 constant http://www.gap-system.org/lib?pcgs?IsFiniteOrdersPcgs
 Declares http://www.gap-system.org/lib?pcgs http://www.gap-system.org/lib?pcgs?IsModuloPcgs
diff --git a/relational/http..www.gap-system.org/lib/pcgsind.rel b/relational/http..www.gap-system.org/lib/pcgsind.rel
index 3138aba59205ba8782908f00f600f66a243e6606..dddc23793c15dcbef7ad97a90a54bcc045250386 100644
--- a/relational/http..www.gap-system.org/lib/pcgsind.rel
+++ b/relational/http..www.gap-system.org/lib/pcgsind.rel
@@ -77,6 +77,61 @@ implies http://www.gap-system.org/lib?pcgsind?SiftedPcElement http://www.gap-sys
 IsAttribute http://www.gap-system.org/lib?pcgsind?AsInducedPcgs
 implies http://www.gap-system.org/lib?pcgsind?AsInducedPcgs http://www.gap-system.org/lib?pcgs?IsPcgs
 implies http://www.gap-system.org/lib?pcgsind?AsInducedPcgs http://www.gap-system.org/lib?list?IsList
+dataconstructor http://www.gap-system.org/lib?pcgsind?IsInducedPcgs
+dataconstructor http://www.gap-system.org/lib?pcgsind?IsInducedPcgs_st0
+dataconstructor http://www.gap-system.org/lib?pcgsind?IsInducedPcgs_st1
+dataconstructor http://www.gap-system.org/lib?pcgsind?IsInducedPcgs_st2
+dataconstructor http://www.gap-system.org/lib?pcgsind?IsInducedPcgs_st3
+dataconstructor http://www.gap-system.org/lib?pcgsind?IsInducedPcgs_st4
+dataconstructor http://www.gap-system.org/lib?pcgsind?IsInducedPcgs_st5
+dataconstructor http://www.gap-system.org/lib?pcgsind?IsInducedPcgs_st6
+dataconstructor http://www.gap-system.org/lib?pcgsind?IsInducedPcgs_st7
+dataconstructor http://www.gap-system.org/lib?pcgsind?IsInducedPcgs_st8
+dataconstructor http://www.gap-system.org/lib?pcgsind?IsInducedPcgs_st9
+dataconstructor http://www.gap-system.org/lib?pcgsind?IsInducedPcgs_st10
+dataconstructor http://www.gap-system.org/lib?pcgsind?IsInducedPcgs_st11
+dataconstructor http://www.gap-system.org/lib?pcgsind?IsInducedPcgs_st12
+dataconstructor http://www.gap-system.org/lib?pcgsind?IsInducedPcgs_st13
+dataconstructor http://www.gap-system.org/lib?pcgsind?IsInducedPcgs_st14
+dataconstructor http://www.gap-system.org/lib?pcgsind?IsInducedPcgs_st15
+dataconstructor http://www.gap-system.org/lib?pcgsind?IsInducedPcgs_st16
+dataconstructor http://www.gap-system.org/lib?pcgsind?IsInducedPcgs_st17
+dataconstructor http://www.gap-system.org/lib?pcgsind?IsInducedPcgs_st18
+dataconstructor http://www.gap-system.org/lib?pcgsind?IsInducedPcgs_st19
+dataconstructor http://www.gap-system.org/lib?pcgsind?IsInducedPcgs_st20
+dataconstructor http://www.gap-system.org/lib?pcgsind?ParentPcgs
+dataconstructor http://www.gap-system.org/lib?pcgsind?IsInducedPcgsRep
+dataconstructor http://www.gap-system.org/lib?pcgsind?IsInducedPcgsRep_st0
+dataconstructor http://www.gap-system.org/lib?pcgsind?IsInducedPcgsRep_st1
+dataconstructor http://www.gap-system.org/lib?pcgsind?IsInducedPcgsRep_st2
+dataconstructor http://www.gap-system.org/lib?pcgsind?InducedPcgsByGeneratorsNC
+dataconstructor http://www.gap-system.org/lib?pcgsind?InducedPcgsByPcSequence
+dataconstructor http://www.gap-system.org/lib?pcgsind?IsCanonicalPcgs
+dataconstructor http://www.gap-system.org/lib?pcgsind?IsParentPcgsFamilyPcgs
+dataconstructor http://www.gap-system.org/lib?pcgsind?HomomorphicCanonicalPcgs
+dataconstructor http://www.gap-system.org/lib?pcgsind?CanonicalPcgsByGeneratorsWithImages
+dataconstructor http://www.gap-system.org/lib?pcgsind?HomomorphicInducedPcgs
+dataconstructor http://www.gap-system.org/lib?pcgsind?CanonicalPcgs
+dataconstructor http://www.gap-system.org/lib?pcgsind?InducedPcgsByGeneratorsWithImages
+dataconstructor http://www.gap-system.org/lib?pcgsind?InducedPcgsByGenerators
+dataconstructor http://www.gap-system.org/lib?pcgsind?InducedPcgsByPcSequenceNC
+dataconstructor http://www.gap-system.org/lib?pcgsind?CanonicalPcElement
+dataconstructor http://www.gap-system.org/lib?pcgsind?IsSubsetInducedPcgsRep
+dataconstructor http://www.gap-system.org/lib?pcgsind?IsSubsetInducedPcgsRep_st0
+dataconstructor http://www.gap-system.org/lib?pcgsind?IsSubsetInducedPcgsRep_st1
+dataconstructor http://www.gap-system.org/lib?pcgsind?IsSubsetInducedPcgsRep_st2
+dataconstructor http://www.gap-system.org/lib?pcgsind?IsSubsetInducedPcgsRep_st3
+dataconstructor http://www.gap-system.org/lib?pcgsind?InducedPcgsByPcSequenceAndGenerators
+dataconstructor http://www.gap-system.org/lib?pcgsind?LeadCoeffsIGS
+dataconstructor http://www.gap-system.org/lib?pcgsind?ElementaryAbelianSubseries
+dataconstructor http://www.gap-system.org/lib?pcgsind?IsTailInducedPcgsRep
+dataconstructor http://www.gap-system.org/lib?pcgsind?IsTailInducedPcgsRep_st0
+dataconstructor http://www.gap-system.org/lib?pcgsind?IsTailInducedPcgsRep_st1
+dataconstructor http://www.gap-system.org/lib?pcgsind?IsTailInducedPcgsRep_st2
+dataconstructor http://www.gap-system.org/lib?pcgsind?IsTailInducedPcgsRep_st3
+dataconstructor http://www.gap-system.org/lib?pcgsind?IsTailInducedPcgsRep_st4
+dataconstructor http://www.gap-system.org/lib?pcgsind?SiftedPcElement
+dataconstructor http://www.gap-system.org/lib?pcgsind?AsInducedPcgs
 theory http://www.gap-system.org/lib?pcgsind
 HasMeta http://www.gap-system.org/lib?pcgsind http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?pcgsind http://www.gap-system.org/lib?list
@@ -128,7 +183,6 @@ Declares http://www.gap-system.org/lib?pcgsind http://www.gap-system.org/lib?pcg
 constant http://www.gap-system.org/lib?pcgsind?IsInducedPcgs_st19
 Declares http://www.gap-system.org/lib?pcgsind http://www.gap-system.org/lib?pcgsind?IsInducedPcgs_st20
 constant http://www.gap-system.org/lib?pcgsind?IsInducedPcgs_st20
-Includes http://www.gap-system.org/lib?pcgsind http://www.gap-system.org/lib?pcgsind
 Declares http://www.gap-system.org/lib?pcgsind http://www.gap-system.org/lib?pcgsind?ParentPcgs
 constant http://www.gap-system.org/lib?pcgsind?ParentPcgs
 Includes http://www.gap-system.org/lib?pcgsind http://www.gap-system.org/lib?type
diff --git a/relational/http..www.gap-system.org/lib/pcgsmodu.rel b/relational/http..www.gap-system.org/lib/pcgsmodu.rel
index bb59d890fe7d2b882d951c4adab8ffb09d9c7aef..fde477bb8cc316d4d59605a059d90825d131e685 100644
--- a/relational/http..www.gap-system.org/lib/pcgsmodu.rel
+++ b/relational/http..www.gap-system.org/lib/pcgsmodu.rel
@@ -47,6 +47,44 @@ implies http://www.gap-system.org/lib?pcgsmodu?IsSubsetInducedNumeratorModuloTai
 implies http://www.gap-system.org/lib?pcgsmodu?IsSubsetInducedNumeratorModuloTailPcgsRep_st4 http://www.gap-system.org/lib?pcgs?IsPcgsDefaultRep
 implies http://www.gap-system.org/lib?pcgsmodu?IsSubsetInducedNumeratorModuloTailPcgsRep_st4 http://www.gap-system.org/lib?pcgsmodu?IsModuloPcgsRep
 implies http://www.gap-system.org/lib?pcgsmodu?IsSubsetInducedNumeratorModuloTailPcgsRep_st4 http://www.gap-system.org/lib?pcgsmodu?IsModuloTailPcgsRep
+dataconstructor http://www.gap-system.org/lib?pcgsmodu?IsModuloPcgsRep
+dataconstructor http://www.gap-system.org/lib?pcgsmodu?IsModuloPcgsRep_st0
+dataconstructor http://www.gap-system.org/lib?pcgsmodu?IsModuloPcgsRep_st1
+dataconstructor http://www.gap-system.org/lib?pcgsmodu?IsModuloPcgsRep_st2
+dataconstructor http://www.gap-system.org/lib?pcgsmodu?DenominatorOfModuloPcgs
+dataconstructor http://www.gap-system.org/lib?pcgsmodu?ModuloPcgsByPcSequenceNC
+dataconstructor http://www.gap-system.org/lib?pcgsmodu?IsModuloTailPcgsRep
+dataconstructor http://www.gap-system.org/lib?pcgsmodu?IsModuloTailPcgsRep_st0
+dataconstructor http://www.gap-system.org/lib?pcgsmodu?IsModuloTailPcgsRep_st1
+dataconstructor http://www.gap-system.org/lib?pcgsmodu?IsModuloTailPcgsRep_st2
+dataconstructor http://www.gap-system.org/lib?pcgsmodu?IsModuloTailPcgsRep_st3
+dataconstructor http://www.gap-system.org/lib?pcgsmodu?IsModuloTailPcgsByListRep
+dataconstructor http://www.gap-system.org/lib?pcgsmodu?IsModuloTailPcgsByListRep_st0
+dataconstructor http://www.gap-system.org/lib?pcgsmodu?IsModuloTailPcgsByListRep_st1
+dataconstructor http://www.gap-system.org/lib?pcgsmodu?IsModuloTailPcgsByListRep_st2
+dataconstructor http://www.gap-system.org/lib?pcgsmodu?IsModuloTailPcgsByListRep_st3
+dataconstructor http://www.gap-system.org/lib?pcgsmodu?IsModuloTailPcgsByListRep_st4
+dataconstructor http://www.gap-system.org/lib?pcgsmodu?IsNumeratorParentLayersForExponentsRep
+dataconstructor http://www.gap-system.org/lib?pcgsmodu?IsNumeratorParentLayersForExponentsRep_st0
+dataconstructor http://www.gap-system.org/lib?pcgsmodu?IsNumeratorParentLayersForExponentsRep_st1
+dataconstructor http://www.gap-system.org/lib?pcgsmodu?IsNumeratorParentLayersForExponentsRep_st2
+dataconstructor http://www.gap-system.org/lib?pcgsmodu?IsNumeratorParentLayersForExponentsRep_st3
+dataconstructor http://www.gap-system.org/lib?pcgsmodu?NumeratorOfModuloPcgs
+dataconstructor http://www.gap-system.org/lib?pcgsmodu?IsNumeratorParentForExponentsRep
+dataconstructor http://www.gap-system.org/lib?pcgsmodu?IsNumeratorParentForExponentsRep_st0
+dataconstructor http://www.gap-system.org/lib?pcgsmodu?IsNumeratorParentForExponentsRep_st1
+dataconstructor http://www.gap-system.org/lib?pcgsmodu?IsNumeratorParentForExponentsRep_st2
+dataconstructor http://www.gap-system.org/lib?pcgsmodu?IsNumeratorParentForExponentsRep_st3
+dataconstructor http://www.gap-system.org/lib?pcgsmodu?ModuloPcgs
+dataconstructor http://www.gap-system.org/lib?pcgsmodu?ExponentsConjugateLayer
+dataconstructor http://www.gap-system.org/lib?pcgsmodu?ModuloPcgsByPcSequence
+dataconstructor http://www.gap-system.org/lib?pcgsmodu?IsNumeratorParentPcgsFamilyPcgs
+dataconstructor http://www.gap-system.org/lib?pcgsmodu?IsSubsetInducedNumeratorModuloTailPcgsRep
+dataconstructor http://www.gap-system.org/lib?pcgsmodu?IsSubsetInducedNumeratorModuloTailPcgsRep_st0
+dataconstructor http://www.gap-system.org/lib?pcgsmodu?IsSubsetInducedNumeratorModuloTailPcgsRep_st1
+dataconstructor http://www.gap-system.org/lib?pcgsmodu?IsSubsetInducedNumeratorModuloTailPcgsRep_st2
+dataconstructor http://www.gap-system.org/lib?pcgsmodu?IsSubsetInducedNumeratorModuloTailPcgsRep_st3
+dataconstructor http://www.gap-system.org/lib?pcgsmodu?IsSubsetInducedNumeratorModuloTailPcgsRep_st4
 theory http://www.gap-system.org/lib?pcgsmodu
 HasMeta http://www.gap-system.org/lib?pcgsmodu http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?pcgsmodu http://www.gap-system.org/lib?type
@@ -64,7 +102,6 @@ constant http://www.gap-system.org/lib?pcgsmodu?DenominatorOfModuloPcgs
 Includes http://www.gap-system.org/lib?pcgsmodu http://www.gap-system.org/lib?list
 Declares http://www.gap-system.org/lib?pcgsmodu http://www.gap-system.org/lib?pcgsmodu?ModuloPcgsByPcSequenceNC
 constant http://www.gap-system.org/lib?pcgsmodu?ModuloPcgsByPcSequenceNC
-Includes http://www.gap-system.org/lib?pcgsmodu http://www.gap-system.org/lib?pcgsmodu
 Declares http://www.gap-system.org/lib?pcgsmodu http://www.gap-system.org/lib?pcgsmodu?IsModuloTailPcgsRep
 constant http://www.gap-system.org/lib?pcgsmodu?IsModuloTailPcgsRep
 Declares http://www.gap-system.org/lib?pcgsmodu http://www.gap-system.org/lib?pcgsmodu?IsModuloTailPcgsRep_st0
diff --git a/relational/http..www.gap-system.org/lib/pcgspcg.rel b/relational/http..www.gap-system.org/lib/pcgspcg.rel
index 052d5404bd522400cd77191fe1c046bb8ec679b8..3022dac113c23f26a7ab4d9ca9273a44eb3bc0fa 100644
--- a/relational/http..www.gap-system.org/lib/pcgspcg.rel
+++ b/relational/http..www.gap-system.org/lib/pcgspcg.rel
@@ -9,6 +9,16 @@ implies http://www.gap-system.org/lib?pcgspcg?IsSortedPcgsRep_st3 http://www.gap
 implies http://www.gap-system.org/lib?pcgspcg?IsSortedPcgsRep_st3 http://www.gap-system.org/lib?type?IsAttributeStoringRep
 implies http://www.gap-system.org/lib?pcgspcg?IsSortedPcgsRep_st3 http://www.gap-system.org/lib?pcgs?IsPcgsDefaultRep
 implies http://www.gap-system.org/lib?pcgspcg?IsSortedPcgsRep_st3 http://www.gap-system.org/lib?pcgspcg?IsUnsortedPcgsRep
+dataconstructor http://www.gap-system.org/lib?pcgspcg?IsFamilyPcgs
+dataconstructor http://www.gap-system.org/lib?pcgspcg?IsUnsortedPcgsRep
+dataconstructor http://www.gap-system.org/lib?pcgspcg?IsUnsortedPcgsRep_st0
+dataconstructor http://www.gap-system.org/lib?pcgspcg?IsUnsortedPcgsRep_st1
+dataconstructor http://www.gap-system.org/lib?pcgspcg?IsUnsortedPcgsRep_st2
+dataconstructor http://www.gap-system.org/lib?pcgspcg?IsSortedPcgsRep
+dataconstructor http://www.gap-system.org/lib?pcgspcg?IsSortedPcgsRep_st0
+dataconstructor http://www.gap-system.org/lib?pcgspcg?IsSortedPcgsRep_st1
+dataconstructor http://www.gap-system.org/lib?pcgspcg?IsSortedPcgsRep_st2
+dataconstructor http://www.gap-system.org/lib?pcgspcg?IsSortedPcgsRep_st3
 theory http://www.gap-system.org/lib?pcgspcg
 HasMeta http://www.gap-system.org/lib?pcgspcg http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?pcgspcg http://www.gap-system.org/lib?pcgs
@@ -23,7 +33,6 @@ Declares http://www.gap-system.org/lib?pcgspcg http://www.gap-system.org/lib?pcg
 constant http://www.gap-system.org/lib?pcgspcg?IsUnsortedPcgsRep_st1
 Declares http://www.gap-system.org/lib?pcgspcg http://www.gap-system.org/lib?pcgspcg?IsUnsortedPcgsRep_st2
 constant http://www.gap-system.org/lib?pcgspcg?IsUnsortedPcgsRep_st2
-Includes http://www.gap-system.org/lib?pcgspcg http://www.gap-system.org/lib?pcgspcg
 Declares http://www.gap-system.org/lib?pcgspcg http://www.gap-system.org/lib?pcgspcg?IsSortedPcgsRep
 constant http://www.gap-system.org/lib?pcgspcg?IsSortedPcgsRep
 Declares http://www.gap-system.org/lib?pcgspcg http://www.gap-system.org/lib?pcgspcg?IsSortedPcgsRep_st0
diff --git a/relational/http..www.gap-system.org/lib/pcgsperm.rel b/relational/http..www.gap-system.org/lib/pcgsperm.rel
index ce1d63660b536be841dd1e65a5f470fceb25f7fd..5d33a6c1b480f2a768bd8466670c88b72cc516c7 100644
--- a/relational/http..www.gap-system.org/lib/pcgsperm.rel
+++ b/relational/http..www.gap-system.org/lib/pcgsperm.rel
@@ -48,6 +48,78 @@ implies http://www.gap-system.org/lib?pcgsperm?IsModuloPcgsPermGroupRep_st5 http
 implies http://www.gap-system.org/lib?pcgsperm?IsModuloPcgsPermGroupRep_st5 http://www.gap-system.org/lib?pcgs?IsPcgsDefaultRep
 implies http://www.gap-system.org/lib?pcgsperm?IsModuloPcgsPermGroupRep_st5 http://www.gap-system.org/lib?pcgs?IsFiniteOrdersPcgs
 implies http://www.gap-system.org/lib?pcgsperm?IsModuloPcgsPermGroupRep_st5 http://www.gap-system.org/lib?pcgsperm?IsPcgsPermGroupRep
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsPcgsPermGroupRep
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsPcgsPermGroupRep_st0
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsPcgsPermGroupRep_st1
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsPcgsPermGroupRep_st2
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsPcgsPermGroupRep_st3
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsPcgsPermGroupRep_st4
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st0
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st1
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st2
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st3
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st4
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st5
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st6
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st7
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st8
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st9
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st10
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st11
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st12
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st13
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st14
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st15
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st16
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st17
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st18
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st19
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st20
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st21
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st22
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st23
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st24
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st25
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st26
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st27
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st28
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st29
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st30
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st31
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st32
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st33
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st34
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st35
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st36
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st37
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st38
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st39
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st40
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st41
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st42
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st43
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st44
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st45
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st46
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st47
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st48
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st49
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st50
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st51
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st52
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st53
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st54
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st55
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st56
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st57
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsModuloPcgsPermGroupRep
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsModuloPcgsPermGroupRep_st0
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsModuloPcgsPermGroupRep_st1
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsModuloPcgsPermGroupRep_st2
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsModuloPcgsPermGroupRep_st3
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsModuloPcgsPermGroupRep_st4
+dataconstructor http://www.gap-system.org/lib?pcgsperm?IsModuloPcgsPermGroupRep_st5
 theory http://www.gap-system.org/lib?pcgsperm
 HasMeta http://www.gap-system.org/lib?pcgsperm http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?pcgsperm http://www.gap-system.org/lib?type
@@ -191,7 +263,6 @@ Declares http://www.gap-system.org/lib?pcgsperm http://www.gap-system.org/lib?pc
 constant http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st56
 Declares http://www.gap-system.org/lib?pcgsperm http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st57
 constant http://www.gap-system.org/lib?pcgsperm?IsMemberPcSeriesPermGroup_st57
-Includes http://www.gap-system.org/lib?pcgsperm http://www.gap-system.org/lib?pcgsperm
 Declares http://www.gap-system.org/lib?pcgsperm http://www.gap-system.org/lib?pcgsperm?IsModuloPcgsPermGroupRep
 constant http://www.gap-system.org/lib?pcgsperm?IsModuloPcgsPermGroupRep
 Declares http://www.gap-system.org/lib?pcgsperm http://www.gap-system.org/lib?pcgsperm?IsModuloPcgsPermGroupRep_st0
diff --git a/relational/http..www.gap-system.org/lib/pcgsspec.rel b/relational/http..www.gap-system.org/lib/pcgsspec.rel
index f26c2f52026d80ba0734fe5fde3039dab36122a2..77ccdd5c853e42306411635b463809f86556d8fb 100644
--- a/relational/http..www.gap-system.org/lib/pcgsspec.rel
+++ b/relational/http..www.gap-system.org/lib/pcgsspec.rel
@@ -25,6 +25,18 @@ implies http://www.gap-system.org/lib?pcgsspec?IsSpecialPcgs http://www.gap-syst
 IsAttribute http://www.gap-system.org/lib?pcgsspec?CanonicalPcgsWrtSpecialPcgs
 implies http://www.gap-system.org/lib?pcgsspec?CanonicalPcgsWrtSpecialPcgs http://www.gap-system.org/lib?magma?IsMagmaWithInverses
 implies http://www.gap-system.org/lib?pcgsspec?CanonicalPcgsWrtSpecialPcgs http://www.gap-system.org/lib?magma?IsAssociative
+dataconstructor http://www.gap-system.org/lib?pcgsspec?LGLength
+dataconstructor http://www.gap-system.org/lib?pcgsspec?IsInducedPcgsWrtSpecialPcgs
+dataconstructor http://www.gap-system.org/lib?pcgsspec?SpecialPcgs
+dataconstructor http://www.gap-system.org/lib?pcgsspec?IsCanonicalPcgsWrtSpecialPcgs
+dataconstructor http://www.gap-system.org/lib?pcgsspec?LGWeights
+dataconstructor http://www.gap-system.org/lib?pcgsspec?LGTails
+dataconstructor http://www.gap-system.org/lib?pcgsspec?LGLayers
+dataconstructor http://www.gap-system.org/lib?pcgsspec?LGFirst
+dataconstructor http://www.gap-system.org/lib?pcgsspec?LGHeads
+dataconstructor http://www.gap-system.org/lib?pcgsspec?InducedPcgsWrtSpecialPcgs
+dataconstructor http://www.gap-system.org/lib?pcgsspec?IsSpecialPcgs
+dataconstructor http://www.gap-system.org/lib?pcgsspec?CanonicalPcgsWrtSpecialPcgs
 theory http://www.gap-system.org/lib?pcgsspec
 HasMeta http://www.gap-system.org/lib?pcgsspec http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?pcgsspec http://www.gap-system.org/lib?magma
diff --git a/relational/http..www.gap-system.org/lib/permdeco.rel b/relational/http..www.gap-system.org/lib/permdeco.rel
index cdbf45e5057136a1ed9597b9749a8516521ca531..682596a256534a77c72ec82c2c30f76ff34e7cf9 100644
--- a/relational/http..www.gap-system.org/lib/permdeco.rel
+++ b/relational/http..www.gap-system.org/lib/permdeco.rel
@@ -1,6 +1,7 @@
 IsAttribute http://www.gap-system.org/lib?permdeco?StoredPermliftSeries
 implies http://www.gap-system.org/lib?permdeco?StoredPermliftSeries http://www.gap-system.org/lib?magma?IsMagmaWithInverses
 implies http://www.gap-system.org/lib?permdeco?StoredPermliftSeries http://www.gap-system.org/lib?magma?IsAssociative
+dataconstructor http://www.gap-system.org/lib?permdeco?StoredPermliftSeries
 theory http://www.gap-system.org/lib?permdeco
 HasMeta http://www.gap-system.org/lib?permdeco http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?permdeco http://www.gap-system.org/lib?magma
diff --git a/relational/http..www.gap-system.org/lib/permutat.rel b/relational/http..www.gap-system.org/lib/permutat.rel
index e2838bf503730a23557c5ab195be7d558256f281..2a07bd955e6bf1b455ccc858a328440c7439f45d 100644
--- a/relational/http..www.gap-system.org/lib/permutat.rel
+++ b/relational/http..www.gap-system.org/lib/permutat.rel
@@ -48,6 +48,28 @@ implies http://www.gap-system.org/lib?permutat?MovedPoints http://www.gap-system
 implies http://www.gap-system.org/lib?permutat?MovedPoints http://www.gap-system.org/lib?pperm?IsPartialPerm
 IsAttribute http://www.gap-system.org/lib?permutat?DistancePerms
 implies http://www.gap-system.org/lib?permutat?DistancePerms http://www.gap-system.org/lib?permutat?IsPerm
+dataconstructor http://www.gap-system.org/lib?permutat?IsPerm
+dataconstructor http://www.gap-system.org/lib?permutat?IsPerm_st0
+dataconstructor http://www.gap-system.org/lib?permutat?IsPerm_st1
+dataconstructor http://www.gap-system.org/lib?permutat?IsPerm_st2
+dataconstructor http://www.gap-system.org/lib?permutat?IsPerm_st3
+dataconstructor http://www.gap-system.org/lib?permutat?IsPerm_st4
+dataconstructor http://www.gap-system.org/lib?permutat?IsPerm_st5
+dataconstructor http://www.gap-system.org/lib?permutat?IsPerm_st6
+dataconstructor http://www.gap-system.org/lib?permutat?SmallestGeneratorPerm
+dataconstructor http://www.gap-system.org/lib?permutat?IsPerm4Rep
+dataconstructor http://www.gap-system.org/lib?permutat?IsPerm4Rep_st0
+dataconstructor http://www.gap-system.org/lib?permutat?SmallestMovedPoint
+dataconstructor http://www.gap-system.org/lib?permutat?IsPerm2Rep
+dataconstructor http://www.gap-system.org/lib?permutat?IsPerm2Rep_st0
+dataconstructor http://www.gap-system.org/lib?permutat?LargestMovedPoint
+dataconstructor http://www.gap-system.org/lib?permutat?RestrictedPermNC
+dataconstructor http://www.gap-system.org/lib?permutat?CycleStructurePerm
+dataconstructor http://www.gap-system.org/lib?permutat?RestrictedPerm
+dataconstructor http://www.gap-system.org/lib?permutat?SignPerm
+dataconstructor http://www.gap-system.org/lib?permutat?NrMovedPoints
+dataconstructor http://www.gap-system.org/lib?permutat?MovedPoints
+dataconstructor http://www.gap-system.org/lib?permutat?DistancePerms
 theory http://www.gap-system.org/lib?permutat
 HasMeta http://www.gap-system.org/lib?permutat http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?permutat http://www.gap-system.org/lib?arith
@@ -67,7 +89,6 @@ Declares http://www.gap-system.org/lib?permutat http://www.gap-system.org/lib?pe
 constant http://www.gap-system.org/lib?permutat?IsPerm_st5
 Declares http://www.gap-system.org/lib?permutat http://www.gap-system.org/lib?permutat?IsPerm_st6
 constant http://www.gap-system.org/lib?permutat?IsPerm_st6
-Includes http://www.gap-system.org/lib?permutat http://www.gap-system.org/lib?permutat
 Declares http://www.gap-system.org/lib?permutat http://www.gap-system.org/lib?permutat?SmallestGeneratorPerm
 constant http://www.gap-system.org/lib?permutat?SmallestGeneratorPerm
 Includes http://www.gap-system.org/lib?permutat http://www.gap-system.org/lib?type
diff --git a/relational/http..www.gap-system.org/lib/polyrat.rel b/relational/http..www.gap-system.org/lib/polyrat.rel
index 017f7c4c4c25de706a2738a613d887135d053427..59f605f53d2634bf7896d0e6be49f59a888a6627 100644
--- a/relational/http..www.gap-system.org/lib/polyrat.rel
+++ b/relational/http..www.gap-system.org/lib/polyrat.rel
@@ -3,6 +3,8 @@ implies http://www.gap-system.org/lib?polyrat?PrimitivePolynomial http://www.gap
 IsAttribute http://www.gap-system.org/lib?polyrat?MinimizedBombieriNorm
 implies http://www.gap-system.org/lib?polyrat?MinimizedBombieriNorm http://www.gap-system.org/lib?ratfun?IsRationalFunctionsFamilyElement
 implies http://www.gap-system.org/lib?polyrat?MinimizedBombieriNorm http://www.gap-system.org/lib?ratfun?IsPolynomial
+dataconstructor http://www.gap-system.org/lib?polyrat?PrimitivePolynomial
+dataconstructor http://www.gap-system.org/lib?polyrat?MinimizedBombieriNorm
 theory http://www.gap-system.org/lib?polyrat
 HasMeta http://www.gap-system.org/lib?polyrat http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?polyrat http://www.gap-system.org/lib?ratfun
diff --git a/relational/http..www.gap-system.org/lib/pperm.rel b/relational/http..www.gap-system.org/lib/pperm.rel
index 7d5e521280f35e3cf6f138d8b1ddcfee1ba2172d..7c8ac2d6329905c7bb1f5338ee6d88661d4c2172 100644
--- a/relational/http..www.gap-system.org/lib/pperm.rel
+++ b/relational/http..www.gap-system.org/lib/pperm.rel
@@ -70,6 +70,40 @@ IsAttribute http://www.gap-system.org/lib?pperm?PreImagePartialPerm
 implies http://www.gap-system.org/lib?pperm?PreImagePartialPerm http://www.gap-system.org/lib?pperm?IsPartialPerm
 implies http://www.gap-system.org/lib?pperm?PreImagePartialPerm http://www.gap-system.org/lib?cyclotom?IsInt
 implies http://www.gap-system.org/lib?pperm?PreImagePartialPerm http://www.gap-system.org/lib?cyclotom?IsPosRat
+dataconstructor http://www.gap-system.org/lib?pperm?IsPartialPerm
+dataconstructor http://www.gap-system.org/lib?pperm?IsPartialPerm_st0
+dataconstructor http://www.gap-system.org/lib?pperm?IsPartialPerm_st1
+dataconstructor http://www.gap-system.org/lib?pperm?IsPartialPerm_st2
+dataconstructor http://www.gap-system.org/lib?pperm?IsPartialPerm_st3
+dataconstructor http://www.gap-system.org/lib?pperm?IsPartialPerm_st4
+dataconstructor http://www.gap-system.org/lib?pperm?IsPartialPerm_st5
+dataconstructor http://www.gap-system.org/lib?pperm?FixedPointsOfPartialPerm
+dataconstructor http://www.gap-system.org/lib?pperm?IsPPerm2Rep
+dataconstructor http://www.gap-system.org/lib?pperm?IsPPerm2Rep_st0
+dataconstructor http://www.gap-system.org/lib?pperm?PartialPermOpNC
+dataconstructor http://www.gap-system.org/lib?pperm?RestrictedPartialPerm
+dataconstructor http://www.gap-system.org/lib?pperm?PermLeftQuoPartialPermNC
+dataconstructor http://www.gap-system.org/lib?pperm?ComponentPartialPermInt
+dataconstructor http://www.gap-system.org/lib?pperm?AsPartialPerm
+dataconstructor http://www.gap-system.org/lib?pperm?ComponentRepsOfPartialPerm
+dataconstructor http://www.gap-system.org/lib?pperm?NrFixedPoints
+dataconstructor http://www.gap-system.org/lib?pperm?TrimPartialPerm
+dataconstructor http://www.gap-system.org/lib?pperm?DomainOfPartialPerm
+dataconstructor http://www.gap-system.org/lib?pperm?IndexPeriodOfPartialPerm
+dataconstructor http://www.gap-system.org/lib?pperm?PartialPermOp
+dataconstructor http://www.gap-system.org/lib?pperm?PermLeftQuoPartialPerm
+dataconstructor http://www.gap-system.org/lib?pperm?ImageSetOfPartialPerm
+dataconstructor http://www.gap-system.org/lib?pperm?CodegreeOfPartialPermCollection
+dataconstructor http://www.gap-system.org/lib?pperm?RankOfPartialPermCollection
+dataconstructor http://www.gap-system.org/lib?pperm?ComponentsOfPartialPerm
+dataconstructor http://www.gap-system.org/lib?pperm?DomainOfPartialPermCollection
+dataconstructor http://www.gap-system.org/lib?pperm?IsPPerm4Rep
+dataconstructor http://www.gap-system.org/lib?pperm?IsPPerm4Rep_st0
+dataconstructor http://www.gap-system.org/lib?pperm?NrComponentsOfPartialPerm
+dataconstructor http://www.gap-system.org/lib?pperm?ImageOfPartialPermCollection
+dataconstructor http://www.gap-system.org/lib?pperm?ImageListOfPartialPerm
+dataconstructor http://www.gap-system.org/lib?pperm?DegreeOfPartialPermCollection
+dataconstructor http://www.gap-system.org/lib?pperm?PreImagePartialPerm
 theory http://www.gap-system.org/lib?pperm
 HasMeta http://www.gap-system.org/lib?pperm http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?pperm http://www.gap-system.org/lib?arith
@@ -87,7 +121,6 @@ Declares http://www.gap-system.org/lib?pperm http://www.gap-system.org/lib?pperm
 constant http://www.gap-system.org/lib?pperm?IsPartialPerm_st4
 Declares http://www.gap-system.org/lib?pperm http://www.gap-system.org/lib?pperm?IsPartialPerm_st5
 constant http://www.gap-system.org/lib?pperm?IsPartialPerm_st5
-Includes http://www.gap-system.org/lib?pperm http://www.gap-system.org/lib?pperm
 Declares http://www.gap-system.org/lib?pperm http://www.gap-system.org/lib?pperm?FixedPointsOfPartialPerm
 constant http://www.gap-system.org/lib?pperm?FixedPointsOfPartialPerm
 Includes http://www.gap-system.org/lib?pperm http://www.gap-system.org/lib?type
diff --git a/relational/http..www.gap-system.org/lib/pquot.rel b/relational/http..www.gap-system.org/lib/pquot.rel
index 63d39567c5d44d9dfac70287d478b2bc92fbd873..5b2fc731045b040dc6ba789bb21fe922d460109d 100644
--- a/relational/http..www.gap-system.org/lib/pquot.rel
+++ b/relational/http..www.gap-system.org/lib/pquot.rel
@@ -12,6 +12,10 @@ implies http://www.gap-system.org/lib?pquot?EpimorphismNilpotentQuotientOp http:
 implies http://www.gap-system.org/lib?pquot?EpimorphismNilpotentQuotientOp http://www.gap-system.org/lib?magma?IsAssociative
 IsAttribute http://www.gap-system.org/lib?pquot?EpimorphismQuotientSystem
 implies http://www.gap-system.org/lib?pquot?EpimorphismQuotientSystem http://www.gap-system.org/lib?quotsys?IsQuotientSystem
+dataconstructor http://www.gap-system.org/lib?pquot?EpimorphismPGroup
+dataconstructor http://www.gap-system.org/lib?pquot?Nucleus
+dataconstructor http://www.gap-system.org/lib?pquot?EpimorphismNilpotentQuotientOp
+dataconstructor http://www.gap-system.org/lib?pquot?EpimorphismQuotientSystem
 theory http://www.gap-system.org/lib?pquot
 HasMeta http://www.gap-system.org/lib?pquot http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?pquot http://www.gap-system.org/lib?magma
diff --git a/relational/http..www.gap-system.org/lib/process.rel b/relational/http..www.gap-system.org/lib/process.rel
index 9abdea6e172f810d5314d6c616fd574fc133d9af..8b24d8bc2e5f7f87056584806cf9d911d82347eb 100644
--- a/relational/http..www.gap-system.org/lib/process.rel
+++ b/relational/http..www.gap-system.org/lib/process.rel
@@ -4,6 +4,7 @@ implies http://www.gap-system.org/lib?process?Process http://www.gap-system.org/
 implies http://www.gap-system.org/lib?process?Process http://www.gap-system.org/lib?streams?IsInputStream
 implies http://www.gap-system.org/lib?process?Process http://www.gap-system.org/lib?streams?IsOutputStream
 implies http://www.gap-system.org/lib?process?Process http://www.gap-system.org/lib?list?IsList
+dataconstructor http://www.gap-system.org/lib?process?Process
 theory http://www.gap-system.org/lib?process
 HasMeta http://www.gap-system.org/lib?process http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?process http://www.gap-system.org/lib?files
diff --git a/relational/http..www.gap-system.org/lib/quotsys.rel b/relational/http..www.gap-system.org/lib/quotsys.rel
index a3852675f32546a4c9aecc0f80fa5b71fb6adec1..ec997d83a514b3435a0460bf3a7e3cfb922f5694 100644
--- a/relational/http..www.gap-system.org/lib/quotsys.rel
+++ b/relational/http..www.gap-system.org/lib/quotsys.rel
@@ -59,11 +59,33 @@ IsAttribute http://www.gap-system.org/lib?quotsys?ClearDefinitionNC
 implies http://www.gap-system.org/lib?quotsys?ClearDefinitionNC http://www.gap-system.org/lib?quotsys?IsQuotientSystem
 implies http://www.gap-system.org/lib?quotsys?ClearDefinitionNC http://www.gap-system.org/lib?cyclotom?IsInt
 implies http://www.gap-system.org/lib?quotsys?ClearDefinitionNC http://www.gap-system.org/lib?cyclotom?IsPosRat
+dataconstructor http://www.gap-system.org/lib?quotsys?IsQuotientSystem
+dataconstructor http://www.gap-system.org/lib?quotsys?DefineNewGenerators
+dataconstructor http://www.gap-system.org/lib?quotsys?IsPQuotientSystem
+dataconstructor http://www.gap-system.org/lib?quotsys?CheckConsistencyOfDefinitions
+dataconstructor http://www.gap-system.org/lib?quotsys?IncorporateCentralRelations
+dataconstructor http://www.gap-system.org/lib?quotsys?EvaluateRelators
+dataconstructor http://www.gap-system.org/lib?quotsys?GeneratorsOfLayer
+dataconstructor http://www.gap-system.org/lib?quotsys?GetDefinitionNC
+dataconstructor http://www.gap-system.org/lib?quotsys?RenumberHighestWeightGenerators
+dataconstructor http://www.gap-system.org/lib?quotsys?GeneratorNumberOfQuotient
+dataconstructor http://www.gap-system.org/lib?quotsys?TailsInverses
+dataconstructor http://www.gap-system.org/lib?quotsys?LengthOfDescendingSeries
+dataconstructor http://www.gap-system.org/lib?quotsys?IsNilpQuotientSystem
+dataconstructor http://www.gap-system.org/lib?quotsys?ExtRepByTailVector
+dataconstructor http://www.gap-system.org/lib?quotsys?EvaluateConsistency
+dataconstructor http://www.gap-system.org/lib?quotsys?LiftEpimorphism
+dataconstructor http://www.gap-system.org/lib?quotsys?TraceDefinition
+dataconstructor http://www.gap-system.org/lib?quotsys?SplitWordTail
+dataconstructor http://www.gap-system.org/lib?quotsys?ComputeTails
+dataconstructor http://www.gap-system.org/lib?quotsys?RanksOfDescendingSeries
+dataconstructor http://www.gap-system.org/lib?quotsys?QuotientSystem
+dataconstructor http://www.gap-system.org/lib?quotsys?GroupByQuotientSystem
+dataconstructor http://www.gap-system.org/lib?quotsys?ClearDefinitionNC
 theory http://www.gap-system.org/lib?quotsys
 HasMeta http://www.gap-system.org/lib?quotsys http://www.gap-system.org/?Types
 Declares http://www.gap-system.org/lib?quotsys http://www.gap-system.org/lib?quotsys?IsQuotientSystem
 constant http://www.gap-system.org/lib?quotsys?IsQuotientSystem
-Includes http://www.gap-system.org/lib?quotsys http://www.gap-system.org/lib?quotsys
 Declares http://www.gap-system.org/lib?quotsys http://www.gap-system.org/lib?quotsys?DefineNewGenerators
 constant http://www.gap-system.org/lib?quotsys?DefineNewGenerators
 Declares http://www.gap-system.org/lib?quotsys http://www.gap-system.org/lib?quotsys?IsPQuotientSystem
diff --git a/relational/http..www.gap-system.org/lib/randiso.rel b/relational/http..www.gap-system.org/lib/randiso.rel
index de30d693b6282b988809da3b2b20064aa9898e90..9b7550a9114e7e76a38dd91ad3c728287d3ee393 100644
--- a/relational/http..www.gap-system.org/lib/randiso.rel
+++ b/relational/http..www.gap-system.org/lib/randiso.rel
@@ -1,6 +1,7 @@
 IsAttribute http://www.gap-system.org/lib?randiso?OmegaAndLowerPCentralSeries
 implies http://www.gap-system.org/lib?randiso?OmegaAndLowerPCentralSeries http://www.gap-system.org/lib?magma?IsMagmaWithInverses
 implies http://www.gap-system.org/lib?randiso?OmegaAndLowerPCentralSeries http://www.gap-system.org/lib?magma?IsAssociative
+dataconstructor http://www.gap-system.org/lib?randiso?OmegaAndLowerPCentralSeries
 theory http://www.gap-system.org/lib?randiso
 HasMeta http://www.gap-system.org/lib?randiso http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?randiso http://www.gap-system.org/lib?magma
diff --git a/relational/http..www.gap-system.org/lib/random.rel b/relational/http..www.gap-system.org/lib/random.rel
index 033c5c8f7e8ab5b292f51fdc8c5fb0a9136ae7bb..bb9f540d9c02161e8099942280f9f95cb2f9c12f 100644
--- a/relational/http..www.gap-system.org/lib/random.rel
+++ b/relational/http..www.gap-system.org/lib/random.rel
@@ -17,6 +17,21 @@ IsAttribute http://www.gap-system.org/lib?random?RandomSource
 implies http://www.gap-system.org/lib?random?RandomSource http://www.gap-system.org/lib?function?IsOperation
 IsAttribute http://www.gap-system.org/lib?random?State
 implies http://www.gap-system.org/lib?random?State http://www.gap-system.org/lib?random?IsRandomSource
+dataconstructor http://www.gap-system.org/lib?random?IsRandomSource
+dataconstructor http://www.gap-system.org/lib?random?IsRandomSource_st0
+dataconstructor http://www.gap-system.org/lib?random?IsGAPRandomSource
+dataconstructor http://www.gap-system.org/lib?random?IsGAPRandomSource_st0
+dataconstructor http://www.gap-system.org/lib?random?IsGAPRandomSource_st1
+dataconstructor http://www.gap-system.org/lib?random?IsGlobalRandomSource
+dataconstructor http://www.gap-system.org/lib?random?IsGlobalRandomSource_st0
+dataconstructor http://www.gap-system.org/lib?random?IsGlobalRandomSource_st1
+dataconstructor http://www.gap-system.org/lib?random?Init
+dataconstructor http://www.gap-system.org/lib?random?Reset
+dataconstructor http://www.gap-system.org/lib?random?IsMersenneTwister
+dataconstructor http://www.gap-system.org/lib?random?IsMersenneTwister_st0
+dataconstructor http://www.gap-system.org/lib?random?IsMersenneTwister_st1
+dataconstructor http://www.gap-system.org/lib?random?RandomSource
+dataconstructor http://www.gap-system.org/lib?random?State
 theory http://www.gap-system.org/lib?random
 HasMeta http://www.gap-system.org/lib?random http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?random http://www.gap-system.org/lib?type
@@ -24,7 +39,6 @@ Declares http://www.gap-system.org/lib?random http://www.gap-system.org/lib?rand
 constant http://www.gap-system.org/lib?random?IsRandomSource
 Declares http://www.gap-system.org/lib?random http://www.gap-system.org/lib?random?IsRandomSource_st0
 constant http://www.gap-system.org/lib?random?IsRandomSource_st0
-Includes http://www.gap-system.org/lib?random http://www.gap-system.org/lib?random
 Declares http://www.gap-system.org/lib?random http://www.gap-system.org/lib?random?IsGAPRandomSource
 constant http://www.gap-system.org/lib?random?IsGAPRandomSource
 Declares http://www.gap-system.org/lib?random http://www.gap-system.org/lib?random?IsGAPRandomSource_st0
diff --git a/relational/http..www.gap-system.org/lib/ratfun.rel b/relational/http..www.gap-system.org/lib/ratfun.rel
index d0787335a511102a724819cd765571a3a8c9bc87..150677dd10ff68e7a101e36619955e826bd183ec 100644
--- a/relational/http..www.gap-system.org/lib/ratfun.rel
+++ b/relational/http..www.gap-system.org/lib/ratfun.rel
@@ -282,6 +282,221 @@ implies http://www.gap-system.org/lib?ratfun?Value http://www.gap-system.org/lib
 implies http://www.gap-system.org/lib?ratfun?Value http://www.gap-system.org/lib?list?IsList
 implies http://www.gap-system.org/lib?ratfun?Value http://www.gap-system.org/lib?float?IsFloatRationalFunction
 implies http://www.gap-system.org/lib?ratfun?Value http://www.gap-system.org/lib?float?IsFloat
+dataconstructor http://www.gap-system.org/lib?ratfun?IsPolynomialFunction
+dataconstructor http://www.gap-system.org/lib?ratfun?IsPolynomialFunction_st0
+dataconstructor http://www.gap-system.org/lib?ratfun?IsPolynomialFunction_st1
+dataconstructor http://www.gap-system.org/lib?ratfun?IsPolynomialFunction_st2
+dataconstructor http://www.gap-system.org/lib?ratfun?IsPolynomialFunction_st3
+dataconstructor http://www.gap-system.org/lib?ratfun?IsPolynomialFunction_st4
+dataconstructor http://www.gap-system.org/lib?ratfun?IsPolynomialFunction_st5
+dataconstructor http://www.gap-system.org/lib?ratfun?IsPolynomialFunction_st6
+dataconstructor http://www.gap-system.org/lib?ratfun?IsPolynomialFunction_st7
+dataconstructor http://www.gap-system.org/lib?ratfun?IsPolynomialFunction_st8
+dataconstructor http://www.gap-system.org/lib?ratfun?IsPolynomialFunction_st9
+dataconstructor http://www.gap-system.org/lib?ratfun?IsPolynomialFunction_st10
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunction
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunction_st0
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunction_st1
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunction_st2
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunction_st3
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunction_st4
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunction_st5
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunction_st6
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunction_st7
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunction_st8
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunction_st9
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunction_st10
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunction_st11
+dataconstructor http://www.gap-system.org/lib?ratfun?IsPolynomial
+dataconstructor http://www.gap-system.org/lib?ratfun?Discriminant
+dataconstructor http://www.gap-system.org/lib?ratfun?IsUnivariatePolynomialsFamilyElement
+dataconstructor http://www.gap-system.org/lib?ratfun?IsUnivariatePolynomialsFamilyElement_st0
+dataconstructor http://www.gap-system.org/lib?ratfun?IsUnivariatePolynomialsFamilyElement_st1
+dataconstructor http://www.gap-system.org/lib?ratfun?IsUnivariatePolynomialsFamilyElement_st2
+dataconstructor http://www.gap-system.org/lib?ratfun?IsUnivariatePolynomialsFamilyElement_st3
+dataconstructor http://www.gap-system.org/lib?ratfun?IsUnivariatePolynomialsFamilyElement_st4
+dataconstructor http://www.gap-system.org/lib?ratfun?IsUnivariatePolynomialsFamilyElement_st5
+dataconstructor http://www.gap-system.org/lib?ratfun?IsUnivariatePolynomialsFamilyElement_st6
+dataconstructor http://www.gap-system.org/lib?ratfun?IsUnivariatePolynomialsFamilyElement_st7
+dataconstructor http://www.gap-system.org/lib?ratfun?IsUnivariatePolynomialsFamilyElement_st8
+dataconstructor http://www.gap-system.org/lib?ratfun?IsUnivariatePolynomialsFamilyElement_st9
+dataconstructor http://www.gap-system.org/lib?ratfun?IsUnivariatePolynomialsFamilyElement_st10
+dataconstructor http://www.gap-system.org/lib?ratfun?IsUnivariatePolynomialsFamilyElement_st11
+dataconstructor http://www.gap-system.org/lib?ratfun?IsUnivariatePolynomialsFamilyElement_st12
+dataconstructor http://www.gap-system.org/lib?ratfun?IsLaurentPolynomial
+dataconstructor http://www.gap-system.org/lib?ratfun?CoefficientsOfLaurentPolynomial
+dataconstructor http://www.gap-system.org/lib?ratfun?IsLaurentPolynomialsFamilyElement
+dataconstructor http://www.gap-system.org/lib?ratfun?IsLaurentPolynomialsFamilyElement_st0
+dataconstructor http://www.gap-system.org/lib?ratfun?IsLaurentPolynomialsFamilyElement_st1
+dataconstructor http://www.gap-system.org/lib?ratfun?IsLaurentPolynomialsFamilyElement_st2
+dataconstructor http://www.gap-system.org/lib?ratfun?IsLaurentPolynomialsFamilyElement_st3
+dataconstructor http://www.gap-system.org/lib?ratfun?IsLaurentPolynomialsFamilyElement_st4
+dataconstructor http://www.gap-system.org/lib?ratfun?IsLaurentPolynomialsFamilyElement_st5
+dataconstructor http://www.gap-system.org/lib?ratfun?IsLaurentPolynomialsFamilyElement_st6
+dataconstructor http://www.gap-system.org/lib?ratfun?IsLaurentPolynomialsFamilyElement_st7
+dataconstructor http://www.gap-system.org/lib?ratfun?IsLaurentPolynomialsFamilyElement_st8
+dataconstructor http://www.gap-system.org/lib?ratfun?IsLaurentPolynomialsFamilyElement_st9
+dataconstructor http://www.gap-system.org/lib?ratfun?IsLaurentPolynomialsFamilyElement_st10
+dataconstructor http://www.gap-system.org/lib?ratfun?IsLaurentPolynomialsFamilyElement_st11
+dataconstructor http://www.gap-system.org/lib?ratfun?IsLaurentPolynomialsFamilyElement_st12
+dataconstructor http://www.gap-system.org/lib?ratfun?LaurentPolynomialByCoefficients
+dataconstructor http://www.gap-system.org/lib?ratfun?ExtRepPolynomialRatFun
+dataconstructor http://www.gap-system.org/lib?ratfun?CoefficientsFamily
+dataconstructor http://www.gap-system.org/lib?ratfun?IsUnivariateRationalFunction
+dataconstructor http://www.gap-system.org/lib?ratfun?IsLaurentPolynomialDefaultRep
+dataconstructor http://www.gap-system.org/lib?ratfun?IsLaurentPolynomialDefaultRep_st0
+dataconstructor http://www.gap-system.org/lib?ratfun?IsLaurentPolynomialDefaultRep_st1
+dataconstructor http://www.gap-system.org/lib?ratfun?IsLaurentPolynomialDefaultRep_st2
+dataconstructor http://www.gap-system.org/lib?ratfun?IsLaurentPolynomialDefaultRep_st3
+dataconstructor http://www.gap-system.org/lib?ratfun?IsLaurentPolynomialDefaultRep_st4
+dataconstructor http://www.gap-system.org/lib?ratfun?IsLaurentPolynomialDefaultRep_st5
+dataconstructor http://www.gap-system.org/lib?ratfun?IsLaurentPolynomialDefaultRep_st6
+dataconstructor http://www.gap-system.org/lib?ratfun?IsLaurentPolynomialDefaultRep_st7
+dataconstructor http://www.gap-system.org/lib?ratfun?IsLaurentPolynomialDefaultRep_st8
+dataconstructor http://www.gap-system.org/lib?ratfun?IsLaurentPolynomialDefaultRep_st9
+dataconstructor http://www.gap-system.org/lib?ratfun?IsLaurentPolynomialDefaultRep_st10
+dataconstructor http://www.gap-system.org/lib?ratfun?IsLaurentPolynomialDefaultRep_st11
+dataconstructor http://www.gap-system.org/lib?ratfun?IsLaurentPolynomialDefaultRep_st12
+dataconstructor http://www.gap-system.org/lib?ratfun?IsLaurentPolynomialDefaultRep_st13
+dataconstructor http://www.gap-system.org/lib?ratfun?IsLaurentPolynomialDefaultRep_st14
+dataconstructor http://www.gap-system.org/lib?ratfun?IsLaurentPolynomialDefaultRep_st15
+dataconstructor http://www.gap-system.org/lib?ratfun?IsLaurentPolynomialDefaultRep_st16
+dataconstructor http://www.gap-system.org/lib?ratfun?IsLaurentPolynomialDefaultRep_st17
+dataconstructor http://www.gap-system.org/lib?ratfun?Resultant
+dataconstructor http://www.gap-system.org/lib?ratfun?DenominatorOfRationalFunction
+dataconstructor http://www.gap-system.org/lib?ratfun?IsPolynomialFunctionsFamily
+dataconstructor http://www.gap-system.org/lib?ratfun?IsPolynomialFunctionsFamily_st0
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunctionsFamily
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunctionsFamily_st0
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunctionsFamily_st1
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunctionsFamily_st2
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunctionsFamily_st3
+dataconstructor http://www.gap-system.org/lib?ratfun?IsPolynomialDefaultRep
+dataconstructor http://www.gap-system.org/lib?ratfun?IsPolynomialDefaultRep_st0
+dataconstructor http://www.gap-system.org/lib?ratfun?IsPolynomialDefaultRep_st1
+dataconstructor http://www.gap-system.org/lib?ratfun?IsPolynomialDefaultRep_st2
+dataconstructor http://www.gap-system.org/lib?ratfun?IsPolynomialDefaultRep_st3
+dataconstructor http://www.gap-system.org/lib?ratfun?IsPolynomialDefaultRep_st4
+dataconstructor http://www.gap-system.org/lib?ratfun?IsPolynomialDefaultRep_st5
+dataconstructor http://www.gap-system.org/lib?ratfun?IsPolynomialDefaultRep_st6
+dataconstructor http://www.gap-system.org/lib?ratfun?IsPolynomialDefaultRep_st7
+dataconstructor http://www.gap-system.org/lib?ratfun?IsPolynomialDefaultRep_st8
+dataconstructor http://www.gap-system.org/lib?ratfun?IsPolynomialDefaultRep_st9
+dataconstructor http://www.gap-system.org/lib?ratfun?IsPolynomialDefaultRep_st10
+dataconstructor http://www.gap-system.org/lib?ratfun?IsPolynomialDefaultRep_st11
+dataconstructor http://www.gap-system.org/lib?ratfun?IsPolynomialDefaultRep_st12
+dataconstructor http://www.gap-system.org/lib?ratfun?IsPolynomialDefaultRep_st13
+dataconstructor http://www.gap-system.org/lib?ratfun?IsPolynomialDefaultRep_st14
+dataconstructor http://www.gap-system.org/lib?ratfun?IsPolynomialDefaultRep_st15
+dataconstructor http://www.gap-system.org/lib?ratfun?ZippedSum
+dataconstructor http://www.gap-system.org/lib?ratfun?DegreeOfLaurentPolynomial
+dataconstructor http://www.gap-system.org/lib?ratfun?PolynomialCoefficientsOfPolynomial
+dataconstructor http://www.gap-system.org/lib?ratfun?IsLaurentPolynomialsFamily
+dataconstructor http://www.gap-system.org/lib?ratfun?IsLaurentPolynomialsFamily_st0
+dataconstructor http://www.gap-system.org/lib?ratfun?IsLaurentPolynomialsFamily_st1
+dataconstructor http://www.gap-system.org/lib?ratfun?IsLaurentPolynomialsFamily_st2
+dataconstructor http://www.gap-system.org/lib?ratfun?IsLaurentPolynomialsFamily_st3
+dataconstructor http://www.gap-system.org/lib?ratfun?IsUnivariatePolynomialsFamily
+dataconstructor http://www.gap-system.org/lib?ratfun?IsUnivariatePolynomialsFamily_st0
+dataconstructor http://www.gap-system.org/lib?ratfun?IsUnivariateRationalFunctionDefaultRep
+dataconstructor http://www.gap-system.org/lib?ratfun?IsUnivariateRationalFunctionDefaultRep_st0
+dataconstructor http://www.gap-system.org/lib?ratfun?IsUnivariateRationalFunctionDefaultRep_st1
+dataconstructor http://www.gap-system.org/lib?ratfun?IsUnivariateRationalFunctionDefaultRep_st2
+dataconstructor http://www.gap-system.org/lib?ratfun?IsUnivariateRationalFunctionDefaultRep_st3
+dataconstructor http://www.gap-system.org/lib?ratfun?IsUnivariateRationalFunctionDefaultRep_st4
+dataconstructor http://www.gap-system.org/lib?ratfun?IsUnivariateRationalFunctionDefaultRep_st5
+dataconstructor http://www.gap-system.org/lib?ratfun?IsUnivariateRationalFunctionDefaultRep_st6
+dataconstructor http://www.gap-system.org/lib?ratfun?IsUnivariateRationalFunctionDefaultRep_st7
+dataconstructor http://www.gap-system.org/lib?ratfun?IsUnivariateRationalFunctionDefaultRep_st8
+dataconstructor http://www.gap-system.org/lib?ratfun?IsUnivariateRationalFunctionDefaultRep_st9
+dataconstructor http://www.gap-system.org/lib?ratfun?IsUnivariateRationalFunctionDefaultRep_st10
+dataconstructor http://www.gap-system.org/lib?ratfun?IsUnivariateRationalFunctionDefaultRep_st11
+dataconstructor http://www.gap-system.org/lib?ratfun?IsUnivariateRationalFunctionDefaultRep_st12
+dataconstructor http://www.gap-system.org/lib?ratfun?IsUnivariateRationalFunctionDefaultRep_st13
+dataconstructor http://www.gap-system.org/lib?ratfun?IsUnivariateRationalFunctionDefaultRep_st14
+dataconstructor http://www.gap-system.org/lib?ratfun?IsUnivariateRationalFunctionDefaultRep_st15
+dataconstructor http://www.gap-system.org/lib?ratfun?LeadingCoefficient
+dataconstructor http://www.gap-system.org/lib?ratfun?IsPolynomialFunctionsFamilyElement
+dataconstructor http://www.gap-system.org/lib?ratfun?IsPolynomialFunctionsFamilyElement_st0
+dataconstructor http://www.gap-system.org/lib?ratfun?IsPolynomialFunctionsFamilyElement_st1
+dataconstructor http://www.gap-system.org/lib?ratfun?IsPolynomialFunctionsFamilyElement_st2
+dataconstructor http://www.gap-system.org/lib?ratfun?IsPolynomialFunctionsFamilyElement_st3
+dataconstructor http://www.gap-system.org/lib?ratfun?IsPolynomialFunctionsFamilyElement_st4
+dataconstructor http://www.gap-system.org/lib?ratfun?IsPolynomialFunctionsFamilyElement_st5
+dataconstructor http://www.gap-system.org/lib?ratfun?IsPolynomialFunctionsFamilyElement_st6
+dataconstructor http://www.gap-system.org/lib?ratfun?IsPolynomialFunctionsFamilyElement_st7
+dataconstructor http://www.gap-system.org/lib?ratfun?IsPolynomialFunctionsFamilyElement_st8
+dataconstructor http://www.gap-system.org/lib?ratfun?IsPolynomialFunctionsFamilyElement_st9
+dataconstructor http://www.gap-system.org/lib?ratfun?IsPolynomialFunctionsFamilyElement_st10
+dataconstructor http://www.gap-system.org/lib?ratfun?IsPolynomialFunctionsFamilyElement_st11
+dataconstructor http://www.gap-system.org/lib?ratfun?CoefficientsOfUnivariateRationalFunction
+dataconstructor http://www.gap-system.org/lib?ratfun?ExtRepDenominatorRatFun
+dataconstructor http://www.gap-system.org/lib?ratfun?ZeroCoefficientRatFun
+dataconstructor http://www.gap-system.org/lib?ratfun?LeadingMonomial
+dataconstructor http://www.gap-system.org/lib?ratfun?NumeratorOfRationalFunction
+dataconstructor http://www.gap-system.org/lib?ratfun?IsZeroRationalFunction
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunctionsFamilyElement
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunctionsFamilyElement_st0
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunctionsFamilyElement_st1
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunctionsFamilyElement_st2
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunctionsFamilyElement_st3
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunctionsFamilyElement_st4
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunctionsFamilyElement_st5
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunctionsFamilyElement_st6
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunctionsFamilyElement_st7
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunctionsFamilyElement_st8
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunctionsFamilyElement_st9
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunctionsFamilyElement_st10
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunctionsFamilyElement_st11
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunctionsFamilyElement_st12
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunctionsFamilyElement_st13
+dataconstructor http://www.gap-system.org/lib?ratfun?DegreeIndeterminate
+dataconstructor http://www.gap-system.org/lib?ratfun?HeuristicCancelPolynomialsExtRep
+dataconstructor http://www.gap-system.org/lib?ratfun?UnivariatePolynomialByCoefficients
+dataconstructor http://www.gap-system.org/lib?ratfun?Derivative
+dataconstructor http://www.gap-system.org/lib?ratfun?AsPolynomial
+dataconstructor http://www.gap-system.org/lib?ratfun?IsUnivariatePolynomial
+dataconstructor http://www.gap-system.org/lib?ratfun?IndeterminateName
+dataconstructor http://www.gap-system.org/lib?ratfun?RationalFunctionsFamily
+dataconstructor http://www.gap-system.org/lib?ratfun?UnivariatePolynomial
+dataconstructor http://www.gap-system.org/lib?ratfun?ZippedProduct
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunctionDefaultRep
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunctionDefaultRep_st0
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunctionDefaultRep_st1
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunctionDefaultRep_st2
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunctionDefaultRep_st3
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunctionDefaultRep_st4
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunctionDefaultRep_st5
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunctionDefaultRep_st6
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunctionDefaultRep_st7
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunctionDefaultRep_st8
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunctionDefaultRep_st9
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunctionDefaultRep_st10
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunctionDefaultRep_st11
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunctionDefaultRep_st12
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunctionDefaultRep_st13
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunctionDefaultRep_st14
+dataconstructor http://www.gap-system.org/lib?ratfun?UnivariateRationalFunctionByCoefficients
+dataconstructor http://www.gap-system.org/lib?ratfun?CoefficientsOfUnivariatePolynomial
+dataconstructor http://www.gap-system.org/lib?ratfun?IndeterminateOfUnivariateRationalFunction
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunctionOverField
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunctionOverField_st0
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunctionOverField_st1
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunctionOverField_st2
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunctionOverField_st3
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunctionOverField_st4
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunctionOverField_st5
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunctionOverField_st6
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunctionOverField_st7
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunctionOverField_st8
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunctionOverField_st9
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunctionOverField_st10
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunctionOverField_st11
+dataconstructor http://www.gap-system.org/lib?ratfun?IsRationalFunctionOverField_st12
+dataconstructor http://www.gap-system.org/lib?ratfun?IndeterminateNumberOfUnivariateRationalFunction
+dataconstructor http://www.gap-system.org/lib?ratfun?ExtRepNumeratorRatFun
+dataconstructor http://www.gap-system.org/lib?ratfun?IsConstantRationalFunction
+dataconstructor http://www.gap-system.org/lib?ratfun?Value
 theory http://www.gap-system.org/lib?ratfun
 HasMeta http://www.gap-system.org/lib?ratfun http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?ratfun http://www.gap-system.org/lib?arith
@@ -309,7 +524,6 @@ Declares http://www.gap-system.org/lib?ratfun http://www.gap-system.org/lib?ratf
 constant http://www.gap-system.org/lib?ratfun?IsPolynomialFunction_st9
 Declares http://www.gap-system.org/lib?ratfun http://www.gap-system.org/lib?ratfun?IsPolynomialFunction_st10
 constant http://www.gap-system.org/lib?ratfun?IsPolynomialFunction_st10
-Includes http://www.gap-system.org/lib?ratfun http://www.gap-system.org/lib?ratfun
 Declares http://www.gap-system.org/lib?ratfun http://www.gap-system.org/lib?ratfun?IsRationalFunction
 constant http://www.gap-system.org/lib?ratfun?IsRationalFunction
 Declares http://www.gap-system.org/lib?ratfun http://www.gap-system.org/lib?ratfun?IsRationalFunction_st0
diff --git a/relational/http..www.gap-system.org/lib/rational.rel b/relational/http..www.gap-system.org/lib/rational.rel
index 47590e63f59edb1992bf9d0d1b94907d0e256318..a30db1f49dd5fc43c9f6ace1cdc34aa87c0b4df3 100644
--- a/relational/http..www.gap-system.org/lib/rational.rel
+++ b/relational/http..www.gap-system.org/lib/rational.rel
@@ -1,6 +1,9 @@
 IsFilter http://www.gap-system.org/lib?rational?IsCanonicalBasisRationals
 implies http://www.gap-system.org/lib?rational?IsCanonicalBasisRationals_st1 http://www.gap-system.org/lib?type?IsComponentObjectRep
 implies http://www.gap-system.org/lib?rational?IsCanonicalBasisRationals_st1 http://www.gap-system.org/lib?type?IsAttributeStoringRep
+dataconstructor http://www.gap-system.org/lib?rational?IsCanonicalBasisRationals
+dataconstructor http://www.gap-system.org/lib?rational?IsCanonicalBasisRationals_st0
+dataconstructor http://www.gap-system.org/lib?rational?IsCanonicalBasisRationals_st1
 theory http://www.gap-system.org/lib?rational
 HasMeta http://www.gap-system.org/lib?rational http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?rational http://www.gap-system.org/lib?type
diff --git a/relational/http..www.gap-system.org/lib/record.rel b/relational/http..www.gap-system.org/lib/record.rel
index 9295616fc63fb8eefbaeb6db519312e58b009800..dee3bde62bd863d137bac770af314c0848f023eb 100644
--- a/relational/http..www.gap-system.org/lib/record.rel
+++ b/relational/http..www.gap-system.org/lib/record.rel
@@ -5,11 +5,16 @@ IsAttribute http://www.gap-system.org/lib?record?Unbind.
 IsAttribute http://www.gap-system.org/lib?record?IsBound.
 IsAttribute http://www.gap-system.org/lib?record?.:=
 IsAttribute http://www.gap-system.org/lib?record?.
+dataconstructor http://www.gap-system.org/lib?record?IsRecord
+dataconstructor http://www.gap-system.org/lib?record?RecNames
+dataconstructor http://www.gap-system.org/lib?record?Unbind.
+dataconstructor http://www.gap-system.org/lib?record?IsBound.
+dataconstructor http://www.gap-system.org/lib?record?.:=
+dataconstructor http://www.gap-system.org/lib?record?.
 theory http://www.gap-system.org/lib?record
 HasMeta http://www.gap-system.org/lib?record http://www.gap-system.org/?Types
 Declares http://www.gap-system.org/lib?record http://www.gap-system.org/lib?record?IsRecord
 constant http://www.gap-system.org/lib?record?IsRecord
-Includes http://www.gap-system.org/lib?record http://www.gap-system.org/lib?record
 Declares http://www.gap-system.org/lib?record http://www.gap-system.org/lib?record?RecNames
 constant http://www.gap-system.org/lib?record?RecNames
 Declares http://www.gap-system.org/lib?record http://www.gap-system.org/lib?record?Unbind.
diff --git a/relational/http..www.gap-system.org/lib/reesmat.rel b/relational/http..www.gap-system.org/lib/reesmat.rel
index 6a6dcc480c858aada29023929d30a8d7d432615c..e72528146326085648ae2a4402d0f4418eb70982 100644
--- a/relational/http..www.gap-system.org/lib/reesmat.rel
+++ b/relational/http..www.gap-system.org/lib/reesmat.rel
@@ -93,6 +93,40 @@ IsFilter http://www.gap-system.org/lib?reesmat?IsReesMatrixSubsemigroup
 implies http://www.gap-system.org/lib?reesmat?IsReesMatrixSubsemigroup http://www.gap-system.org/lib?magma?IsMagma
 implies http://www.gap-system.org/lib?reesmat?IsReesMatrixSubsemigroup http://www.gap-system.org/lib?magma?IsAssociative
 implies http://www.gap-system.org/lib?reesmat?IsReesMatrixSubsemigroup http://www.gap-system.org/lib?reesmat?IsReesMatrixSemigroupElement
+dataconstructor http://www.gap-system.org/lib?reesmat?IsReesZeroMatrixSemigroup
+dataconstructor http://www.gap-system.org/lib?reesmat?ReesMatrixSemigroup
+dataconstructor http://www.gap-system.org/lib?reesmat?AssociatedReesMatrixSemigroupOfDClass
+dataconstructor http://www.gap-system.org/lib?reesmat?IsReesMatrixSemigroupElement
+dataconstructor http://www.gap-system.org/lib?reesmat?IsReesMatrixSemigroupElement_st0
+dataconstructor http://www.gap-system.org/lib?reesmat?IsReesMatrixSemigroupElement_st1
+dataconstructor http://www.gap-system.org/lib?reesmat?IsReesMatrixSemigroupElement_st2
+dataconstructor http://www.gap-system.org/lib?reesmat?IsReesMatrixSemigroupElement_st3
+dataconstructor http://www.gap-system.org/lib?reesmat?GeneratorsOfReesMatrixSemigroup
+dataconstructor http://www.gap-system.org/lib?reesmat?IsReesZeroMatrixSemigroupElement
+dataconstructor http://www.gap-system.org/lib?reesmat?IsReesZeroMatrixSemigroupElement_st0
+dataconstructor http://www.gap-system.org/lib?reesmat?IsReesZeroMatrixSemigroupElement_st1
+dataconstructor http://www.gap-system.org/lib?reesmat?IsReesZeroMatrixSemigroupElement_st2
+dataconstructor http://www.gap-system.org/lib?reesmat?IsReesZeroMatrixSemigroupElement_st3
+dataconstructor http://www.gap-system.org/lib?reesmat?IsReesZeroMatrixSubsemigroup
+dataconstructor http://www.gap-system.org/lib?reesmat?ColumnOfReesMatrixSemigroupElement
+dataconstructor http://www.gap-system.org/lib?reesmat?ReesMatrixSubsemigroup
+dataconstructor http://www.gap-system.org/lib?reesmat?Rows
+dataconstructor http://www.gap-system.org/lib?reesmat?ReesMatrixSemigroupOfFamily
+dataconstructor http://www.gap-system.org/lib?reesmat?UnderlyingSemigroup
+dataconstructor http://www.gap-system.org/lib?reesmat?IsomorphismReesZeroMatrixSemigroup
+dataconstructor http://www.gap-system.org/lib?reesmat?UnderlyingElementOfReesMatrixSemigroupElement
+dataconstructor http://www.gap-system.org/lib?reesmat?ColumnOfReesZeroMatrixSemigroupElement
+dataconstructor http://www.gap-system.org/lib?reesmat?ReesZeroMatrixSubsemigroup
+dataconstructor http://www.gap-system.org/lib?reesmat?Columns
+dataconstructor http://www.gap-system.org/lib?reesmat?IsomorphismReesMatrixSemigroup
+dataconstructor http://www.gap-system.org/lib?reesmat?UnderlyingElementOfReesZeroMatrixSemigroupElement
+dataconstructor http://www.gap-system.org/lib?reesmat?ReesZeroMatrixSemigroup
+dataconstructor http://www.gap-system.org/lib?reesmat?GeneratorsOfReesZeroMatrixSemigroup
+dataconstructor http://www.gap-system.org/lib?reesmat?IsReesMatrixSemigroup
+dataconstructor http://www.gap-system.org/lib?reesmat?RowOfReesMatrixSemigroupElement
+dataconstructor http://www.gap-system.org/lib?reesmat?RowOfReesZeroMatrixSemigroupElement
+dataconstructor http://www.gap-system.org/lib?reesmat?TypeReesMatrixSemigroupElements
+dataconstructor http://www.gap-system.org/lib?reesmat?IsReesMatrixSubsemigroup
 theory http://www.gap-system.org/lib?reesmat
 HasMeta http://www.gap-system.org/lib?reesmat http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?reesmat http://www.gap-system.org/lib?magma
@@ -115,7 +149,6 @@ Declares http://www.gap-system.org/lib?reesmat http://www.gap-system.org/lib?ree
 constant http://www.gap-system.org/lib?reesmat?IsReesMatrixSemigroupElement_st2
 Declares http://www.gap-system.org/lib?reesmat http://www.gap-system.org/lib?reesmat?IsReesMatrixSemigroupElement_st3
 constant http://www.gap-system.org/lib?reesmat?IsReesMatrixSemigroupElement_st3
-Includes http://www.gap-system.org/lib?reesmat http://www.gap-system.org/lib?reesmat
 Declares http://www.gap-system.org/lib?reesmat http://www.gap-system.org/lib?reesmat?GeneratorsOfReesMatrixSemigroup
 constant http://www.gap-system.org/lib?reesmat?GeneratorsOfReesMatrixSemigroup
 Declares http://www.gap-system.org/lib?reesmat http://www.gap-system.org/lib?reesmat?IsReesZeroMatrixSemigroupElement
diff --git a/relational/http..www.gap-system.org/lib/relation.rel b/relational/http..www.gap-system.org/lib/relation.rel
index ea1936e4d7014865b38ceb3c60ffd31cb93e274e..59db06d3d68bbfb08f9dfad715e4a6f5bd045d68 100644
--- a/relational/http..www.gap-system.org/lib/relation.rel
+++ b/relational/http..www.gap-system.org/lib/relation.rel
@@ -63,6 +63,48 @@ implies http://www.gap-system.org/lib?relation?IsEquivalenceClassDefaultRep_st1
 implies http://www.gap-system.org/lib?relation?IsEquivalenceClassDefaultRep_st1 http://www.gap-system.org/lib?type?IsAttributeStoringRep
 IsAttribute http://www.gap-system.org/lib?relation?IsAntisymmetricBinaryRelation
 implies http://www.gap-system.org/lib?relation?IsAntisymmetricBinaryRelation http://www.gap-system.org/lib?mapping?IsEndoGeneralMapping
+dataconstructor http://www.gap-system.org/lib?relation?TransitiveClosureBinaryRelation
+dataconstructor http://www.gap-system.org/lib?relation?IsPreOrderBinaryRelation
+dataconstructor http://www.gap-system.org/lib?relation?IsReflexiveBinaryRelation
+dataconstructor http://www.gap-system.org/lib?relation?IsSymmetricBinaryRelation
+dataconstructor http://www.gap-system.org/lib?relation?IsTransitiveBinaryRelation
+dataconstructor http://www.gap-system.org/lib?relation?IsEquivalenceRelation
+dataconstructor http://www.gap-system.org/lib?relation?IsEquivalenceClass
+dataconstructor http://www.gap-system.org/lib?relation?IsEquivalenceClass_st0
+dataconstructor http://www.gap-system.org/lib?relation?IsEquivalenceClass_st1
+dataconstructor http://www.gap-system.org/lib?relation?IsEquivalenceClass_st2
+dataconstructor http://www.gap-system.org/lib?relation?IsEquivalenceClass_st3
+dataconstructor http://www.gap-system.org/lib?relation?IsEquivalenceClass_st4
+dataconstructor http://www.gap-system.org/lib?relation?EquivalenceClassRelation
+dataconstructor http://www.gap-system.org/lib?relation?PartialOrderOfHasseDiagram
+dataconstructor http://www.gap-system.org/lib?relation?IsBinaryRelationDefaultRep
+dataconstructor http://www.gap-system.org/lib?relation?IsBinaryRelationDefaultRep_st0
+dataconstructor http://www.gap-system.org/lib?relation?IsBinaryRelationDefaultRep_st1
+dataconstructor http://www.gap-system.org/lib?relation?EquivalenceClassOfElementNC
+dataconstructor http://www.gap-system.org/lib?relation?DegreeOfBinaryRelation
+dataconstructor http://www.gap-system.org/lib?relation?IsHasseDiagram
+dataconstructor http://www.gap-system.org/lib?relation?EquivalenceRelationPartition
+dataconstructor http://www.gap-system.org/lib?relation?EquivalenceClassOfElement
+dataconstructor http://www.gap-system.org/lib?relation?IsLatticeOrderBinaryRelation
+dataconstructor http://www.gap-system.org/lib?relation?IsBinaryRelationOnPointsRep
+dataconstructor http://www.gap-system.org/lib?relation?IsBinaryRelationOnPointsRep_st0
+dataconstructor http://www.gap-system.org/lib?relation?IsBinaryRelationOnPointsRep_st1
+dataconstructor http://www.gap-system.org/lib?relation?SymmetricClosureBinaryRelation
+dataconstructor http://www.gap-system.org/lib?relation?StronglyConnectedComponents
+dataconstructor http://www.gap-system.org/lib?relation?MeetEquivalenceRelations
+dataconstructor http://www.gap-system.org/lib?relation?ReflexiveClosureBinaryRelation
+dataconstructor http://www.gap-system.org/lib?relation?GeneratorsOfEquivalenceRelationPartition
+dataconstructor http://www.gap-system.org/lib?relation?IsPartialOrderBinaryRelation
+dataconstructor http://www.gap-system.org/lib?relation?Successors
+dataconstructor http://www.gap-system.org/lib?relation?EquivalenceClasses
+dataconstructor http://www.gap-system.org/lib?relation?JoinEquivalenceRelations
+dataconstructor http://www.gap-system.org/lib?relation?IsEquivalenceRelationDefaultRep
+dataconstructor http://www.gap-system.org/lib?relation?IsEquivalenceRelationDefaultRep_st0
+dataconstructor http://www.gap-system.org/lib?relation?IsEquivalenceRelationDefaultRep_st1
+dataconstructor http://www.gap-system.org/lib?relation?IsEquivalenceClassDefaultRep
+dataconstructor http://www.gap-system.org/lib?relation?IsEquivalenceClassDefaultRep_st0
+dataconstructor http://www.gap-system.org/lib?relation?IsEquivalenceClassDefaultRep_st1
+dataconstructor http://www.gap-system.org/lib?relation?IsAntisymmetricBinaryRelation
 theory http://www.gap-system.org/lib?relation
 HasMeta http://www.gap-system.org/lib?relation http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?relation http://www.gap-system.org/lib?mapping
@@ -93,7 +135,6 @@ Declares http://www.gap-system.org/lib?relation http://www.gap-system.org/lib?re
 constant http://www.gap-system.org/lib?relation?IsEquivalenceClass_st3
 Declares http://www.gap-system.org/lib?relation http://www.gap-system.org/lib?relation?IsEquivalenceClass_st4
 constant http://www.gap-system.org/lib?relation?IsEquivalenceClass_st4
-Includes http://www.gap-system.org/lib?relation http://www.gap-system.org/lib?relation
 Declares http://www.gap-system.org/lib?relation http://www.gap-system.org/lib?relation?EquivalenceClassRelation
 constant http://www.gap-system.org/lib?relation?EquivalenceClassRelation
 Declares http://www.gap-system.org/lib?relation http://www.gap-system.org/lib?relation?PartialOrderOfHasseDiagram
diff --git a/relational/http..www.gap-system.org/lib/ring.rel b/relational/http..www.gap-system.org/lib/ring.rel
index b2a3fcd88ba458c4d9e8240e78da8553f6065636..26aba4412ec5debc94748d59b7ffda09a0b38e9f 100644
--- a/relational/http..www.gap-system.org/lib/ring.rel
+++ b/relational/http..www.gap-system.org/lib/ring.rel
@@ -310,6 +310,102 @@ implies http://www.gap-system.org/lib?ring?Associates http://www.gap-system.org/
 implies http://www.gap-system.org/lib?ring?Associates http://www.gap-system.org/lib?arith?IsNearAdditiveElementWithInverse
 implies http://www.gap-system.org/lib?ring?Associates http://www.gap-system.org/lib?arith?IsAdditiveElement
 implies http://www.gap-system.org/lib?ring?Associates http://www.gap-system.org/lib?arith?IsMultiplicativeElement
+dataconstructor http://www.gap-system.org/lib?ring?IsUniqueFactorizationRing
+dataconstructor http://www.gap-system.org/lib?ring?IsUniqueFactorizationRing_st0
+dataconstructor http://www.gap-system.org/lib?ring?IsUniqueFactorizationRing_st1
+dataconstructor http://www.gap-system.org/lib?ring?IsUniqueFactorizationRing_st2
+dataconstructor http://www.gap-system.org/lib?ring?IsUniqueFactorizationRing_st3
+dataconstructor http://www.gap-system.org/lib?ring?IsUniqueFactorizationRing_st4
+dataconstructor http://www.gap-system.org/lib?ring?IsUniqueFactorizationRing_st5
+dataconstructor http://www.gap-system.org/lib?ring?IsUniqueFactorizationRing_st6
+dataconstructor http://www.gap-system.org/lib?ring?IsUniqueFactorizationRing_st7
+dataconstructor http://www.gap-system.org/lib?ring?IsUniqueFactorizationRing_st8
+dataconstructor http://www.gap-system.org/lib?ring?IsUniqueFactorizationRing_st9
+dataconstructor http://www.gap-system.org/lib?ring?IsUniqueFactorizationRing_st10
+dataconstructor http://www.gap-system.org/lib?ring?IsUniqueFactorizationRing_st11
+dataconstructor http://www.gap-system.org/lib?ring?IsUniqueFactorizationRing_st12
+dataconstructor http://www.gap-system.org/lib?ring?IsUniqueFactorizationRing_st13
+dataconstructor http://www.gap-system.org/lib?ring?IsUniqueFactorizationRing_st14
+dataconstructor http://www.gap-system.org/lib?ring?IsUniqueFactorizationRing_st15
+dataconstructor http://www.gap-system.org/lib?ring?IsUniqueFactorizationRing_st16
+dataconstructor http://www.gap-system.org/lib?ring?IsUniqueFactorizationRing_st17
+dataconstructor http://www.gap-system.org/lib?ring?IsUniqueFactorizationRing_st18
+dataconstructor http://www.gap-system.org/lib?ring?IsUniqueFactorizationRing_st19
+dataconstructor http://www.gap-system.org/lib?ring?IsUniqueFactorizationRing_st20
+dataconstructor http://www.gap-system.org/lib?ring?IsUniqueFactorizationRing_st21
+dataconstructor http://www.gap-system.org/lib?ring?IsUniqueFactorizationRing_st22
+dataconstructor http://www.gap-system.org/lib?ring?IsUniqueFactorizationRing_st23
+dataconstructor http://www.gap-system.org/lib?ring?IsUniqueFactorizationRing_st24
+dataconstructor http://www.gap-system.org/lib?ring?IsUniqueFactorizationRing_st25
+dataconstructor http://www.gap-system.org/lib?ring?IsEuclideanRing
+dataconstructor http://www.gap-system.org/lib?ring?IsEuclideanRing_st0
+dataconstructor http://www.gap-system.org/lib?ring?IsEuclideanRing_st1
+dataconstructor http://www.gap-system.org/lib?ring?IsEuclideanRing_st2
+dataconstructor http://www.gap-system.org/lib?ring?IsEuclideanRing_st3
+dataconstructor http://www.gap-system.org/lib?ring?IsEuclideanRing_st4
+dataconstructor http://www.gap-system.org/lib?ring?IsEuclideanRing_st5
+dataconstructor http://www.gap-system.org/lib?ring?IsEuclideanRing_st6
+dataconstructor http://www.gap-system.org/lib?ring?IsEuclideanRing_st7
+dataconstructor http://www.gap-system.org/lib?ring?IsEuclideanRing_st8
+dataconstructor http://www.gap-system.org/lib?ring?IsEuclideanRing_st9
+dataconstructor http://www.gap-system.org/lib?ring?IsEuclideanRing_st10
+dataconstructor http://www.gap-system.org/lib?ring?IsEuclideanRing_st11
+dataconstructor http://www.gap-system.org/lib?ring?IsEuclideanRing_st12
+dataconstructor http://www.gap-system.org/lib?ring?IsEuclideanRing_st13
+dataconstructor http://www.gap-system.org/lib?ring?IsEuclideanRing_st14
+dataconstructor http://www.gap-system.org/lib?ring?IsEuclideanRing_st15
+dataconstructor http://www.gap-system.org/lib?ring?IsEuclideanRing_st16
+dataconstructor http://www.gap-system.org/lib?ring?IsEuclideanRing_st17
+dataconstructor http://www.gap-system.org/lib?ring?IsEuclideanRing_st18
+dataconstructor http://www.gap-system.org/lib?ring?IsEuclideanRing_st19
+dataconstructor http://www.gap-system.org/lib?ring?IsEuclideanRing_st20
+dataconstructor http://www.gap-system.org/lib?ring?IsEuclideanRing_st21
+dataconstructor http://www.gap-system.org/lib?ring?IsEuclideanRing_st22
+dataconstructor http://www.gap-system.org/lib?ring?IsEuclideanRing_st23
+dataconstructor http://www.gap-system.org/lib?ring?IsEuclideanRing_st24
+dataconstructor http://www.gap-system.org/lib?ring?IsEuclideanRing_st25
+dataconstructor http://www.gap-system.org/lib?ring?IsEuclideanRing_st26
+dataconstructor http://www.gap-system.org/lib?ring?IsEuclideanRing_st27
+dataconstructor http://www.gap-system.org/lib?ring?IsEuclideanRing_st28
+dataconstructor http://www.gap-system.org/lib?ring?IsEuclideanRing_st29
+dataconstructor http://www.gap-system.org/lib?ring?IsJacobianRing
+dataconstructor http://www.gap-system.org/lib?ring?IsZeroSquaredRing
+dataconstructor http://www.gap-system.org/lib?ring?IsZeroMultiplicationRing
+dataconstructor http://www.gap-system.org/lib?ring?InterpolatedPolynomial
+dataconstructor http://www.gap-system.org/lib?ring?IsIntegralRing
+dataconstructor http://www.gap-system.org/lib?ring?GcdRepresentationOp
+dataconstructor http://www.gap-system.org/lib?ring?AsRing
+dataconstructor http://www.gap-system.org/lib?ring?AsNearRing
+dataconstructor http://www.gap-system.org/lib?ring?IsIrreducibleRingElement
+dataconstructor http://www.gap-system.org/lib?ring?IsPrime
+dataconstructor http://www.gap-system.org/lib?ring?DefaultRingByGenerators
+dataconstructor http://www.gap-system.org/lib?ring?QuotientRemainder
+dataconstructor http://www.gap-system.org/lib?ring?LcmOp
+dataconstructor http://www.gap-system.org/lib?ring?IsAssociated
+dataconstructor http://www.gap-system.org/lib?ring?EuclideanQuotient
+dataconstructor http://www.gap-system.org/lib?ring?IsRingWithOne
+dataconstructor http://www.gap-system.org/lib?ring?Units
+dataconstructor http://www.gap-system.org/lib?ring?ClosureRing
+dataconstructor http://www.gap-system.org/lib?ring?IsNearRing
+dataconstructor http://www.gap-system.org/lib?ring?StandardAssociateUnit
+dataconstructor http://www.gap-system.org/lib?ring?GcdOp
+dataconstructor http://www.gap-system.org/lib?ring?PowerMod
+dataconstructor http://www.gap-system.org/lib?ring?Factors
+dataconstructor http://www.gap-system.org/lib?ring?IsRing
+dataconstructor http://www.gap-system.org/lib?ring?Quotient
+dataconstructor http://www.gap-system.org/lib?ring?IsNearRingWithOne
+dataconstructor http://www.gap-system.org/lib?ring?GeneratorsOfRing
+dataconstructor http://www.gap-system.org/lib?ring?EuclideanRemainder
+dataconstructor http://www.gap-system.org/lib?ring?RingByGenerators
+dataconstructor http://www.gap-system.org/lib?ring?QuotientMod
+dataconstructor http://www.gap-system.org/lib?ring?StandardAssociate
+dataconstructor http://www.gap-system.org/lib?ring?IsAnticommutative
+dataconstructor http://www.gap-system.org/lib?ring?PadicValuation
+dataconstructor http://www.gap-system.org/lib?ring?EuclideanDegree
+dataconstructor http://www.gap-system.org/lib?ring?GeneratorsOfRingWithOne
+dataconstructor http://www.gap-system.org/lib?ring?RingWithOneByGenerators
+dataconstructor http://www.gap-system.org/lib?ring?IsUnit
+dataconstructor http://www.gap-system.org/lib?ring?Associates
 theory http://www.gap-system.org/lib?ring
 HasMeta http://www.gap-system.org/lib?ring http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?ring http://www.gap-system.org/lib?coll
@@ -373,7 +469,6 @@ Declares http://www.gap-system.org/lib?ring http://www.gap-system.org/lib?ring?I
 constant http://www.gap-system.org/lib?ring?IsUniqueFactorizationRing_st24
 Declares http://www.gap-system.org/lib?ring http://www.gap-system.org/lib?ring?IsUniqueFactorizationRing_st25
 constant http://www.gap-system.org/lib?ring?IsUniqueFactorizationRing_st25
-Includes http://www.gap-system.org/lib?ring http://www.gap-system.org/lib?ring
 Declares http://www.gap-system.org/lib?ring http://www.gap-system.org/lib?ring?IsEuclideanRing
 constant http://www.gap-system.org/lib?ring?IsEuclideanRing
 Declares http://www.gap-system.org/lib?ring http://www.gap-system.org/lib?ring?IsEuclideanRing_st0
diff --git a/relational/http..www.gap-system.org/lib/ringhom.rel b/relational/http..www.gap-system.org/lib/ringhom.rel
index 81e3e1427bdba7fc115bb54750798500773fcdde..04802df1a2316c6b9691e6e12fcf2ad387cd1b37 100644
--- a/relational/http..www.gap-system.org/lib/ringhom.rel
+++ b/relational/http..www.gap-system.org/lib/ringhom.rel
@@ -60,6 +60,56 @@ implies http://www.gap-system.org/lib?ringhom?RingHomomorphismByImagesNC http://
 implies http://www.gap-system.org/lib?ringhom?RingHomomorphismByImagesNC http://www.gap-system.org/lib?semiring?IsLDistributive
 implies http://www.gap-system.org/lib?ringhom?RingHomomorphismByImagesNC http://www.gap-system.org/lib?semiring?IsRDistributive
 implies http://www.gap-system.org/lib?ringhom?RingHomomorphismByImagesNC http://www.gap-system.org/lib?list?IsHomogeneousList
+dataconstructor http://www.gap-system.org/lib?ringhom?IsRingGeneralMappingByImagesDefaultRep
+dataconstructor http://www.gap-system.org/lib?ringhom?IsRingGeneralMappingByImagesDefaultRep_st0
+dataconstructor http://www.gap-system.org/lib?ringhom?IsRingGeneralMappingByImagesDefaultRep_st1
+dataconstructor http://www.gap-system.org/lib?ringhom?IsRingGeneralMappingByImagesDefaultRep_st2
+dataconstructor http://www.gap-system.org/lib?ringhom?IsRingGeneralMappingByImagesDefaultRep_st3
+dataconstructor http://www.gap-system.org/lib?ringhom?IsRingGeneralMappingByImagesDefaultRep_st4
+dataconstructor http://www.gap-system.org/lib?ringhom?IsRingGeneralMappingByImagesDefaultRep_st5
+dataconstructor http://www.gap-system.org/lib?ringhom?IsRingGeneralMappingByImagesDefaultRep_st6
+dataconstructor http://www.gap-system.org/lib?ringhom?IsRingGeneralMappingByImagesDefaultRep_st7
+dataconstructor http://www.gap-system.org/lib?ringhom?IsRingGeneralMappingByImagesDefaultRep_st8
+dataconstructor http://www.gap-system.org/lib?ringhom?IsRingGeneralMappingByImagesDefaultRep_st9
+dataconstructor http://www.gap-system.org/lib?ringhom?IsRingGeneralMappingByImagesDefaultRep_st10
+dataconstructor http://www.gap-system.org/lib?ringhom?IsRingGeneralMappingByImagesDefaultRep_st11
+dataconstructor http://www.gap-system.org/lib?ringhom?IsRingGeneralMappingByImagesDefaultRep_st12
+dataconstructor http://www.gap-system.org/lib?ringhom?IsRingGeneralMappingByImagesDefaultRep_st13
+dataconstructor http://www.gap-system.org/lib?ringhom?IsRingGeneralMappingByImagesDefaultRep_st14
+dataconstructor http://www.gap-system.org/lib?ringhom?IsRingGeneralMappingByImagesDefaultRep_st15
+dataconstructor http://www.gap-system.org/lib?ringhom?IsRingGeneralMappingByImagesDefaultRep_st16
+dataconstructor http://www.gap-system.org/lib?ringhom?IsRingGeneralMappingByImagesDefaultRep_st17
+dataconstructor http://www.gap-system.org/lib?ringhom?IsRingGeneralMappingByImagesDefaultRep_st18
+dataconstructor http://www.gap-system.org/lib?ringhom?IsRingGeneralMappingByImagesDefaultRep_st19
+dataconstructor http://www.gap-system.org/lib?ringhom?IsRingGeneralMappingByImagesDefaultRep_st20
+dataconstructor http://www.gap-system.org/lib?ringhom?IsRingGeneralMappingByImagesDefaultRep_st21
+dataconstructor http://www.gap-system.org/lib?ringhom?RingGeneralMappingByImages
+dataconstructor http://www.gap-system.org/lib?ringhom?IsSCRingGeneralMappingByImagesDefaultRep
+dataconstructor http://www.gap-system.org/lib?ringhom?IsSCRingGeneralMappingByImagesDefaultRep_st0
+dataconstructor http://www.gap-system.org/lib?ringhom?IsSCRingGeneralMappingByImagesDefaultRep_st1
+dataconstructor http://www.gap-system.org/lib?ringhom?IsSCRingGeneralMappingByImagesDefaultRep_st2
+dataconstructor http://www.gap-system.org/lib?ringhom?IsSCRingGeneralMappingByImagesDefaultRep_st3
+dataconstructor http://www.gap-system.org/lib?ringhom?IsSCRingGeneralMappingByImagesDefaultRep_st4
+dataconstructor http://www.gap-system.org/lib?ringhom?IsSCRingGeneralMappingByImagesDefaultRep_st5
+dataconstructor http://www.gap-system.org/lib?ringhom?IsSCRingGeneralMappingByImagesDefaultRep_st6
+dataconstructor http://www.gap-system.org/lib?ringhom?IsSCRingGeneralMappingByImagesDefaultRep_st7
+dataconstructor http://www.gap-system.org/lib?ringhom?IsSCRingGeneralMappingByImagesDefaultRep_st8
+dataconstructor http://www.gap-system.org/lib?ringhom?IsSCRingGeneralMappingByImagesDefaultRep_st9
+dataconstructor http://www.gap-system.org/lib?ringhom?IsSCRingGeneralMappingByImagesDefaultRep_st10
+dataconstructor http://www.gap-system.org/lib?ringhom?IsSCRingGeneralMappingByImagesDefaultRep_st11
+dataconstructor http://www.gap-system.org/lib?ringhom?IsSCRingGeneralMappingByImagesDefaultRep_st12
+dataconstructor http://www.gap-system.org/lib?ringhom?IsSCRingGeneralMappingByImagesDefaultRep_st13
+dataconstructor http://www.gap-system.org/lib?ringhom?IsSCRingGeneralMappingByImagesDefaultRep_st14
+dataconstructor http://www.gap-system.org/lib?ringhom?IsSCRingGeneralMappingByImagesDefaultRep_st15
+dataconstructor http://www.gap-system.org/lib?ringhom?IsSCRingGeneralMappingByImagesDefaultRep_st16
+dataconstructor http://www.gap-system.org/lib?ringhom?IsSCRingGeneralMappingByImagesDefaultRep_st17
+dataconstructor http://www.gap-system.org/lib?ringhom?IsSCRingGeneralMappingByImagesDefaultRep_st18
+dataconstructor http://www.gap-system.org/lib?ringhom?IsSCRingGeneralMappingByImagesDefaultRep_st19
+dataconstructor http://www.gap-system.org/lib?ringhom?IsSCRingGeneralMappingByImagesDefaultRep_st20
+dataconstructor http://www.gap-system.org/lib?ringhom?IsSCRingGeneralMappingByImagesDefaultRep_st21
+dataconstructor http://www.gap-system.org/lib?ringhom?IsSCRingGeneralMappingByImagesDefaultRep_st22
+dataconstructor http://www.gap-system.org/lib?ringhom?NaturalHomomorphismByIdeal
+dataconstructor http://www.gap-system.org/lib?ringhom?RingHomomorphismByImagesNC
 theory http://www.gap-system.org/lib?ringhom
 HasMeta http://www.gap-system.org/lib?ringhom http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?ringhom http://www.gap-system.org/lib?type
@@ -118,7 +168,6 @@ Includes http://www.gap-system.org/lib?ringhom http://www.gap-system.org/lib?sem
 Includes http://www.gap-system.org/lib?ringhom http://www.gap-system.org/lib?list
 Declares http://www.gap-system.org/lib?ringhom http://www.gap-system.org/lib?ringhom?RingGeneralMappingByImages
 constant http://www.gap-system.org/lib?ringhom?RingGeneralMappingByImages
-Includes http://www.gap-system.org/lib?ringhom http://www.gap-system.org/lib?ringhom
 Declares http://www.gap-system.org/lib?ringhom http://www.gap-system.org/lib?ringhom?IsSCRingGeneralMappingByImagesDefaultRep
 constant http://www.gap-system.org/lib?ringhom?IsSCRingGeneralMappingByImagesDefaultRep
 Declares http://www.gap-system.org/lib?ringhom http://www.gap-system.org/lib?ringhom?IsSCRingGeneralMappingByImagesDefaultRep_st0
diff --git a/relational/http..www.gap-system.org/lib/ringpoly.rel b/relational/http..www.gap-system.org/lib/ringpoly.rel
index 4f052d67ca6899e55440df4efd1c8372fa29427f..7faa0cd33efbe017aa3a08fd281a56b7fc1c1909 100644
--- a/relational/http..www.gap-system.org/lib/ringpoly.rel
+++ b/relational/http..www.gap-system.org/lib/ringpoly.rel
@@ -189,6 +189,208 @@ implies http://www.gap-system.org/lib?ringpoly?FunctionField http://www.gap-syst
 implies http://www.gap-system.org/lib?ringpoly?FunctionField http://www.gap-system.org/lib?semiring?IsRDistributive
 IsAttribute http://www.gap-system.org/lib?ringpoly?CoefficientsRing
 implies http://www.gap-system.org/lib?ringpoly?CoefficientsRing http://www.gap-system.org/lib?ringpoly?IsPolynomialRing
+dataconstructor http://www.gap-system.org/lib?ringpoly?PolynomialRing
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsPolynomialRing
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsPolynomialRing_st0
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsPolynomialRing_st1
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsPolynomialRing_st2
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsPolynomialRing_st3
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsPolynomialRing_st4
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsPolynomialRing_st5
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsPolynomialRing_st6
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsPolynomialRing_st7
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsPolynomialRing_st8
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsPolynomialRing_st9
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsPolynomialRing_st10
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsPolynomialRing_st11
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsPolynomialRing_st12
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsPolynomialRing_st13
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsPolynomialRing_st14
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsPolynomialRing_st15
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsPolynomialRing_st16
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsPolynomialRing_st17
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsPolynomialRing_st18
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsPolynomialRing_st19
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsPolynomialRing_st20
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsPolynomialRing_st21
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsPolynomialRing_st22
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsPolynomialRing_st23
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsPolynomialRing_st24
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsPolynomialRing_st25
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAlgebraicExtensionPolynomialRing
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAlgebraicExtensionPolynomialRing_st0
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAlgebraicExtensionPolynomialRing_st1
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAlgebraicExtensionPolynomialRing_st2
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAlgebraicExtensionPolynomialRing_st3
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAlgebraicExtensionPolynomialRing_st4
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAlgebraicExtensionPolynomialRing_st5
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAlgebraicExtensionPolynomialRing_st6
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAlgebraicExtensionPolynomialRing_st7
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAlgebraicExtensionPolynomialRing_st8
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAlgebraicExtensionPolynomialRing_st9
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAlgebraicExtensionPolynomialRing_st10
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAlgebraicExtensionPolynomialRing_st11
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAlgebraicExtensionPolynomialRing_st12
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAlgebraicExtensionPolynomialRing_st13
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAlgebraicExtensionPolynomialRing_st14
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAlgebraicExtensionPolynomialRing_st15
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAlgebraicExtensionPolynomialRing_st16
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAlgebraicExtensionPolynomialRing_st17
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAlgebraicExtensionPolynomialRing_st18
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAlgebraicExtensionPolynomialRing_st19
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAlgebraicExtensionPolynomialRing_st20
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAlgebraicExtensionPolynomialRing_st21
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAlgebraicExtensionPolynomialRing_st22
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAlgebraicExtensionPolynomialRing_st23
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAlgebraicExtensionPolynomialRing_st24
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAlgebraicExtensionPolynomialRing_st25
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAlgebraicExtensionPolynomialRing_st26
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFunctionField
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFunctionField_st0
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFunctionField_st1
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFunctionField_st2
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFunctionField_st3
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFunctionField_st4
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFunctionField_st5
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFunctionField_st6
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFunctionField_st7
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFunctionField_st8
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFunctionField_st9
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFunctionField_st10
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFunctionField_st11
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFunctionField_st12
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFunctionField_st13
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFunctionField_st14
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFunctionField_st15
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFunctionField_st16
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFunctionField_st17
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFunctionField_st18
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFunctionField_st19
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFunctionField_st20
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFunctionField_st21
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFunctionField_st22
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFunctionField_st23
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFunctionField_st24
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFunctionField_st25
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFiniteFieldPolynomialRing
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFiniteFieldPolynomialRing_st0
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFiniteFieldPolynomialRing_st1
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFiniteFieldPolynomialRing_st2
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFiniteFieldPolynomialRing_st3
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFiniteFieldPolynomialRing_st4
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFiniteFieldPolynomialRing_st5
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFiniteFieldPolynomialRing_st6
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFiniteFieldPolynomialRing_st7
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFiniteFieldPolynomialRing_st8
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFiniteFieldPolynomialRing_st9
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFiniteFieldPolynomialRing_st10
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFiniteFieldPolynomialRing_st11
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFiniteFieldPolynomialRing_st12
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFiniteFieldPolynomialRing_st13
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFiniteFieldPolynomialRing_st14
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFiniteFieldPolynomialRing_st15
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFiniteFieldPolynomialRing_st16
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFiniteFieldPolynomialRing_st17
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFiniteFieldPolynomialRing_st18
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFiniteFieldPolynomialRing_st19
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFiniteFieldPolynomialRing_st20
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFiniteFieldPolynomialRing_st21
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFiniteFieldPolynomialRing_st22
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFiniteFieldPolynomialRing_st23
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFiniteFieldPolynomialRing_st24
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFiniteFieldPolynomialRing_st25
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsFiniteFieldPolynomialRing_st26
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsUnivariatePolynomialRing
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsUnivariatePolynomialRing_st0
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsUnivariatePolynomialRing_st1
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsUnivariatePolynomialRing_st2
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsUnivariatePolynomialRing_st3
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsUnivariatePolynomialRing_st4
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsUnivariatePolynomialRing_st5
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsUnivariatePolynomialRing_st6
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsUnivariatePolynomialRing_st7
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsUnivariatePolynomialRing_st8
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsUnivariatePolynomialRing_st9
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsUnivariatePolynomialRing_st10
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsUnivariatePolynomialRing_st11
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsUnivariatePolynomialRing_st12
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsUnivariatePolynomialRing_st13
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsUnivariatePolynomialRing_st14
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsUnivariatePolynomialRing_st15
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsUnivariatePolynomialRing_st16
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsUnivariatePolynomialRing_st17
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsUnivariatePolynomialRing_st18
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsUnivariatePolynomialRing_st19
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsUnivariatePolynomialRing_st20
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsUnivariatePolynomialRing_st21
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsUnivariatePolynomialRing_st22
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsUnivariatePolynomialRing_st23
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsUnivariatePolynomialRing_st24
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsUnivariatePolynomialRing_st25
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsUnivariatePolynomialRing_st26
+dataconstructor http://www.gap-system.org/lib?ringpoly?IndeterminatesOfPolynomialRing
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAbelianNumberFieldPolynomialRing
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAbelianNumberFieldPolynomialRing_st0
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAbelianNumberFieldPolynomialRing_st1
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAbelianNumberFieldPolynomialRing_st2
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAbelianNumberFieldPolynomialRing_st3
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAbelianNumberFieldPolynomialRing_st4
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAbelianNumberFieldPolynomialRing_st5
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAbelianNumberFieldPolynomialRing_st6
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAbelianNumberFieldPolynomialRing_st7
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAbelianNumberFieldPolynomialRing_st8
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAbelianNumberFieldPolynomialRing_st9
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAbelianNumberFieldPolynomialRing_st10
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAbelianNumberFieldPolynomialRing_st11
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAbelianNumberFieldPolynomialRing_st12
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAbelianNumberFieldPolynomialRing_st13
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAbelianNumberFieldPolynomialRing_st14
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAbelianNumberFieldPolynomialRing_st15
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAbelianNumberFieldPolynomialRing_st16
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAbelianNumberFieldPolynomialRing_st17
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAbelianNumberFieldPolynomialRing_st18
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAbelianNumberFieldPolynomialRing_st19
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAbelianNumberFieldPolynomialRing_st20
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAbelianNumberFieldPolynomialRing_st21
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAbelianNumberFieldPolynomialRing_st22
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAbelianNumberFieldPolynomialRing_st23
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAbelianNumberFieldPolynomialRing_st24
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAbelianNumberFieldPolynomialRing_st25
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsAbelianNumberFieldPolynomialRing_st26
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsRationalsPolynomialRing
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsRationalsPolynomialRing_st0
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsRationalsPolynomialRing_st1
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsRationalsPolynomialRing_st2
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsRationalsPolynomialRing_st3
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsRationalsPolynomialRing_st4
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsRationalsPolynomialRing_st5
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsRationalsPolynomialRing_st6
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsRationalsPolynomialRing_st7
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsRationalsPolynomialRing_st8
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsRationalsPolynomialRing_st9
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsRationalsPolynomialRing_st10
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsRationalsPolynomialRing_st11
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsRationalsPolynomialRing_st12
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsRationalsPolynomialRing_st13
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsRationalsPolynomialRing_st14
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsRationalsPolynomialRing_st15
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsRationalsPolynomialRing_st16
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsRationalsPolynomialRing_st17
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsRationalsPolynomialRing_st18
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsRationalsPolynomialRing_st19
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsRationalsPolynomialRing_st20
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsRationalsPolynomialRing_st21
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsRationalsPolynomialRing_st22
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsRationalsPolynomialRing_st23
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsRationalsPolynomialRing_st24
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsRationalsPolynomialRing_st25
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsRationalsPolynomialRing_st26
+dataconstructor http://www.gap-system.org/lib?ringpoly?IsRationalsPolynomialRing_st27
+dataconstructor http://www.gap-system.org/lib?ringpoly?MinimalPolynomial
+dataconstructor http://www.gap-system.org/lib?ringpoly?UnivariatePolynomialRing
+dataconstructor http://www.gap-system.org/lib?ringpoly?Indeterminate
+dataconstructor http://www.gap-system.org/lib?ringpoly?FunctionField
+dataconstructor http://www.gap-system.org/lib?ringpoly?CoefficientsRing
 theory http://www.gap-system.org/lib?ringpoly
 HasMeta http://www.gap-system.org/lib?ringpoly http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?ringpoly http://www.gap-system.org/lib?magma
@@ -254,7 +456,6 @@ Declares http://www.gap-system.org/lib?ringpoly http://www.gap-system.org/lib?ri
 constant http://www.gap-system.org/lib?ringpoly?IsPolynomialRing_st24
 Declares http://www.gap-system.org/lib?ringpoly http://www.gap-system.org/lib?ringpoly?IsPolynomialRing_st25
 constant http://www.gap-system.org/lib?ringpoly?IsPolynomialRing_st25
-Includes http://www.gap-system.org/lib?ringpoly http://www.gap-system.org/lib?ringpoly
 Declares http://www.gap-system.org/lib?ringpoly http://www.gap-system.org/lib?ringpoly?IsAlgebraicExtensionPolynomialRing
 constant http://www.gap-system.org/lib?ringpoly?IsAlgebraicExtensionPolynomialRing
 Declares http://www.gap-system.org/lib?ringpoly http://www.gap-system.org/lib?ringpoly?IsAlgebraicExtensionPolynomialRing_st0
diff --git a/relational/http..www.gap-system.org/lib/ringsc.rel b/relational/http..www.gap-system.org/lib/ringsc.rel
index 4c893686056581cd8f97d0e7baac79501b431c88..31388d34fb61f6552764116d9cd7cf5e6b3c4efc 100644
--- a/relational/http..www.gap-system.org/lib/ringsc.rel
+++ b/relational/http..www.gap-system.org/lib/ringsc.rel
@@ -50,6 +50,23 @@ implies http://www.gap-system.org/lib?ringsc?IsSubringSCRing http://www.gap-syst
 IsAttribute http://www.gap-system.org/lib?ringsc?DirectSumInfo
 implies http://www.gap-system.org/lib?ringsc?DirectSumInfo http://www.gap-system.org/lib?magma?IsMagmaWithInverses
 implies http://www.gap-system.org/lib?ringsc?DirectSumInfo http://www.gap-system.org/lib?magma?IsAssociative
+dataconstructor http://www.gap-system.org/lib?ringsc?Subrings
+dataconstructor http://www.gap-system.org/lib?ringsc?Ideals
+dataconstructor http://www.gap-system.org/lib?ringsc?IsSCRingObj
+dataconstructor http://www.gap-system.org/lib?ringsc?IsSCRingObj_st0
+dataconstructor http://www.gap-system.org/lib?ringsc?IsSCRingObj_st1
+dataconstructor http://www.gap-system.org/lib?ringsc?IsSCRingObj_st2
+dataconstructor http://www.gap-system.org/lib?ringsc?IsSCRingObj_st3
+dataconstructor http://www.gap-system.org/lib?ringsc?IsSCRingObj_st4
+dataconstructor http://www.gap-system.org/lib?ringsc?IsSCRingObj_st5
+dataconstructor http://www.gap-system.org/lib?ringsc?IsSCRingObj_st6
+dataconstructor http://www.gap-system.org/lib?ringsc?IsSCRingObj_st7
+dataconstructor http://www.gap-system.org/lib?ringsc?IsSCRingObj_st8
+dataconstructor http://www.gap-system.org/lib?ringsc?IsSCRingObj_st9
+dataconstructor http://www.gap-system.org/lib?ringsc?StandardGeneratorsSubringSCRing
+dataconstructor http://www.gap-system.org/lib?ringsc?DirectSumOp
+dataconstructor http://www.gap-system.org/lib?ringsc?IsSubringSCRing
+dataconstructor http://www.gap-system.org/lib?ringsc?DirectSumInfo
 theory http://www.gap-system.org/lib?ringsc
 HasMeta http://www.gap-system.org/lib?ringsc http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?ringsc http://www.gap-system.org/lib?magma
@@ -82,7 +99,6 @@ Declares http://www.gap-system.org/lib?ringsc http://www.gap-system.org/lib?ring
 constant http://www.gap-system.org/lib?ringsc?IsSCRingObj_st8
 Declares http://www.gap-system.org/lib?ringsc http://www.gap-system.org/lib?ringsc?IsSCRingObj_st9
 constant http://www.gap-system.org/lib?ringsc?IsSCRingObj_st9
-Includes http://www.gap-system.org/lib?ringsc http://www.gap-system.org/lib?ringsc
 Declares http://www.gap-system.org/lib?ringsc http://www.gap-system.org/lib?ringsc?StandardGeneratorsSubringSCRing
 constant http://www.gap-system.org/lib?ringsc?StandardGeneratorsSubringSCRing
 Includes http://www.gap-system.org/lib?ringsc http://www.gap-system.org/lib?list
diff --git a/relational/http..www.gap-system.org/lib/rvecempt.rel b/relational/http..www.gap-system.org/lib/rvecempt.rel
index 16881c16f1497278a447c3f9f1155ceff9518396..2c2e91cc9d8bc6e5d83e6d6d3070406085805056 100644
--- a/relational/http..www.gap-system.org/lib/rvecempt.rel
+++ b/relational/http..www.gap-system.org/lib/rvecempt.rel
@@ -5,6 +5,12 @@ implies http://www.gap-system.org/lib?rvecempt?IsEmptyRowVectorRep_st3 http://ww
 implies http://www.gap-system.org/lib?rvecempt?IsEmptyRowVectorRep_st3 http://www.gap-system.org/lib?list?IsConstantTimeAccessList
 IsAttribute http://www.gap-system.org/lib?rvecempt?EmptyRowVector
 implies http://www.gap-system.org/lib?rvecempt?EmptyRowVector http://www.gap-system.org/lib?type?IsFamily
+dataconstructor http://www.gap-system.org/lib?rvecempt?IsEmptyRowVectorRep
+dataconstructor http://www.gap-system.org/lib?rvecempt?IsEmptyRowVectorRep_st0
+dataconstructor http://www.gap-system.org/lib?rvecempt?IsEmptyRowVectorRep_st1
+dataconstructor http://www.gap-system.org/lib?rvecempt?IsEmptyRowVectorRep_st2
+dataconstructor http://www.gap-system.org/lib?rvecempt?IsEmptyRowVectorRep_st3
+dataconstructor http://www.gap-system.org/lib?rvecempt?EmptyRowVector
 theory http://www.gap-system.org/lib?rvecempt
 HasMeta http://www.gap-system.org/lib?rvecempt http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?rvecempt http://www.gap-system.org/lib?list
diff --git a/relational/http..www.gap-system.org/lib/rws.rel b/relational/http..www.gap-system.org/lib/rws.rel
index 741cc2b721840354b25678ff842ffb5961276b2f..b405c8dd33d8674601b06b93eabf81449fb7750c 100644
--- a/relational/http..www.gap-system.org/lib/rws.rel
+++ b/relational/http..www.gap-system.org/lib/rws.rel
@@ -93,6 +93,48 @@ IsAttribute http://www.gap-system.org/lib?rws?AddRuleReduced
 implies http://www.gap-system.org/lib?rws?AddRuleReduced http://www.gap-system.org/lib?object?IsMutable
 implies http://www.gap-system.org/lib?rws?AddRuleReduced http://www.gap-system.org/lib?rws?IsRewritingSystem
 implies http://www.gap-system.org/lib?rws?AddRuleReduced http://www.gap-system.org/lib?list?IsHomogeneousList
+dataconstructor http://www.gap-system.org/lib?rws?IsRewritingSystem
+dataconstructor http://www.gap-system.org/lib?rws?IsRewritingSystem_st0
+dataconstructor http://www.gap-system.org/lib?rws?NumberGeneratorsOfRws
+dataconstructor http://www.gap-system.org/lib?rws?IsBuiltFromMagma
+dataconstructor http://www.gap-system.org/lib?rws?IsBuiltFromMagmaWithOne
+dataconstructor http://www.gap-system.org/lib?rws?IsBuiltFromMagmaWithInverses
+dataconstructor http://www.gap-system.org/lib?rws?IsBuiltFromGroup
+dataconstructor http://www.gap-system.org/lib?rws?ReducedForm
+dataconstructor http://www.gap-system.org/lib?rws?ReducedDifference
+dataconstructor http://www.gap-system.org/lib?rws?Rules
+dataconstructor http://www.gap-system.org/lib?rws?IsBuiltFromAdditiveMagmaWithInverses
+dataconstructor http://www.gap-system.org/lib?rws?IsReducedConfluentRewritingSystem
+dataconstructor http://www.gap-system.org/lib?rws?IsReducedConfluentRewritingSystem_st0
+dataconstructor http://www.gap-system.org/lib?rws?IsReducedConfluentRewritingSystem_st1
+dataconstructor http://www.gap-system.org/lib?rws?ReducedComm
+dataconstructor http://www.gap-system.org/lib?rws?ReducedProduct
+dataconstructor http://www.gap-system.org/lib?rws?SemigroupOfRewritingSystem
+dataconstructor http://www.gap-system.org/lib?rws?ReducedInverse
+dataconstructor http://www.gap-system.org/lib?rws?ReducedOne
+dataconstructor http://www.gap-system.org/lib?rws?MakeConfluent
+dataconstructor http://www.gap-system.org/lib?rws?IsReducedForm
+dataconstructor http://www.gap-system.org/lib?rws?ReducedZero
+dataconstructor http://www.gap-system.org/lib?rws?AddGenerators
+dataconstructor http://www.gap-system.org/lib?rws?ReducedPower
+dataconstructor http://www.gap-system.org/lib?rws?MonoidOfRewritingSystem
+dataconstructor http://www.gap-system.org/lib?rws?ReducedConjugate
+dataconstructor http://www.gap-system.org/lib?rws?FreeStructureOfRewritingSystem
+dataconstructor http://www.gap-system.org/lib?rws?OrderingOfRewritingSystem
+dataconstructor http://www.gap-system.org/lib?rws?IsConfluent
+dataconstructor http://www.gap-system.org/lib?rws?ReducedLeftQuotient
+dataconstructor http://www.gap-system.org/lib?rws?ConfluentRws
+dataconstructor http://www.gap-system.org/lib?rws?ReducedSum
+dataconstructor http://www.gap-system.org/lib?rws?ReducedQuotient
+dataconstructor http://www.gap-system.org/lib?rws?AddRule
+dataconstructor http://www.gap-system.org/lib?rws?GeneratorsOfRws
+dataconstructor http://www.gap-system.org/lib?rws?ReducedScalarProduct
+dataconstructor http://www.gap-system.org/lib?rws?ReducedAdditiveInverse
+dataconstructor http://www.gap-system.org/lib?rws?ReduceRules
+dataconstructor http://www.gap-system.org/lib?rws?IsReduced
+dataconstructor http://www.gap-system.org/lib?rws?IsBuiltFromSemigroup
+dataconstructor http://www.gap-system.org/lib?rws?IsBuiltFromMonoid
+dataconstructor http://www.gap-system.org/lib?rws?AddRuleReduced
 theory http://www.gap-system.org/lib?rws
 HasMeta http://www.gap-system.org/lib?rws http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?rws http://www.gap-system.org/lib?object
@@ -100,7 +142,6 @@ Declares http://www.gap-system.org/lib?rws http://www.gap-system.org/lib?rws?IsR
 constant http://www.gap-system.org/lib?rws?IsRewritingSystem
 Declares http://www.gap-system.org/lib?rws http://www.gap-system.org/lib?rws?IsRewritingSystem_st0
 constant http://www.gap-system.org/lib?rws?IsRewritingSystem_st0
-Includes http://www.gap-system.org/lib?rws http://www.gap-system.org/lib?rws
 Declares http://www.gap-system.org/lib?rws http://www.gap-system.org/lib?rws?NumberGeneratorsOfRws
 constant http://www.gap-system.org/lib?rws?NumberGeneratorsOfRws
 Declares http://www.gap-system.org/lib?rws http://www.gap-system.org/lib?rws?IsBuiltFromMagma
diff --git a/relational/http..www.gap-system.org/lib/rwsdt.rel b/relational/http..www.gap-system.org/lib/rwsdt.rel
index 3f2d2bed51adb157ce51a3e38ea16f3fabd99901..00df8e2a236a375cbc2d44473e75cd00e5697994 100644
--- a/relational/http..www.gap-system.org/lib/rwsdt.rel
+++ b/relational/http..www.gap-system.org/lib/rwsdt.rel
@@ -1,5 +1,7 @@
 IsFilter http://www.gap-system.org/lib?rwsdt?IsDeepThoughtCollectorRep
 implies http://www.gap-system.org/lib?rwsdt?IsDeepThoughtCollectorRep_st0 http://www.gap-system.org/lib?type?IsPositionalObjectRep
+dataconstructor http://www.gap-system.org/lib?rwsdt?IsDeepThoughtCollectorRep
+dataconstructor http://www.gap-system.org/lib?rwsdt?IsDeepThoughtCollectorRep_st0
 theory http://www.gap-system.org/lib?rwsdt
 HasMeta http://www.gap-system.org/lib?rwsdt http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?rwsdt http://www.gap-system.org/lib?type
diff --git a/relational/http..www.gap-system.org/lib/rwsgrp.rel b/relational/http..www.gap-system.org/lib/rwsgrp.rel
index f5ff2bd6cfc4a397c0e9366d23cda432ee98b24b..ba8c5fae29300eacb2dc81095f3b111e74fed771 100644
--- a/relational/http..www.gap-system.org/lib/rwsgrp.rel
+++ b/relational/http..www.gap-system.org/lib/rwsgrp.rel
@@ -14,6 +14,18 @@ IsAttribute http://www.gap-system.org/lib?rwsgrp?ElementByRws
 implies http://www.gap-system.org/lib?rwsgrp?ElementByRws http://www.gap-system.org/lib?rwsgrp?IsElementsFamilyByRws
 IsAttribute http://www.gap-system.org/lib?rwsgrp?GroupByRws
 implies http://www.gap-system.org/lib?rwsgrp?GroupByRws http://www.gap-system.org/lib?rws?IsRewritingSystem
+dataconstructor http://www.gap-system.org/lib?rwsgrp?IsMultiplicativeElementWithInverseByRws
+dataconstructor http://www.gap-system.org/lib?rwsgrp?IsMultiplicativeElementWithInverseByRws_st0
+dataconstructor http://www.gap-system.org/lib?rwsgrp?IsMultiplicativeElementWithInverseByRws_st1
+dataconstructor http://www.gap-system.org/lib?rwsgrp?IsMultiplicativeElementWithInverseByRws_st2
+dataconstructor http://www.gap-system.org/lib?rwsgrp?IsMultiplicativeElementWithInverseByRws_st3
+dataconstructor http://www.gap-system.org/lib?rwsgrp?IsMultiplicativeElementWithInverseByRws_st4
+dataconstructor http://www.gap-system.org/lib?rwsgrp?GroupByRwsNC
+dataconstructor http://www.gap-system.org/lib?rwsgrp?IsElementsFamilyByRws
+dataconstructor http://www.gap-system.org/lib?rwsgrp?IsElementsFamilyByRws_st0
+dataconstructor http://www.gap-system.org/lib?rwsgrp?MultiplicativeElementsWithInversesFamilyByRws
+dataconstructor http://www.gap-system.org/lib?rwsgrp?ElementByRws
+dataconstructor http://www.gap-system.org/lib?rwsgrp?GroupByRws
 theory http://www.gap-system.org/lib?rwsgrp
 HasMeta http://www.gap-system.org/lib?rwsgrp http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?rwsgrp http://www.gap-system.org/lib?arith
@@ -39,7 +51,6 @@ Declares http://www.gap-system.org/lib?rwsgrp http://www.gap-system.org/lib?rwsg
 constant http://www.gap-system.org/lib?rwsgrp?IsElementsFamilyByRws_st0
 Declares http://www.gap-system.org/lib?rwsgrp http://www.gap-system.org/lib?rwsgrp?MultiplicativeElementsWithInversesFamilyByRws
 constant http://www.gap-system.org/lib?rwsgrp?MultiplicativeElementsWithInversesFamilyByRws
-Includes http://www.gap-system.org/lib?rwsgrp http://www.gap-system.org/lib?rwsgrp
 Declares http://www.gap-system.org/lib?rwsgrp http://www.gap-system.org/lib?rwsgrp?ElementByRws
 constant http://www.gap-system.org/lib?rwsgrp?ElementByRws
 Declares http://www.gap-system.org/lib?rwsgrp http://www.gap-system.org/lib?rwsgrp?GroupByRws
diff --git a/relational/http..www.gap-system.org/lib/rwspcclt.rel b/relational/http..www.gap-system.org/lib/rwspcclt.rel
index 13cf556a72bd68dd3cf806962eda6b2ee2d6ce6c..841e9cb0b54bc8846018d137f3391d8d988d2a0b 100644
--- a/relational/http..www.gap-system.org/lib/rwspcclt.rel
+++ b/relational/http..www.gap-system.org/lib/rwspcclt.rel
@@ -74,6 +74,62 @@ IsAttribute http://www.gap-system.org/lib?rwspcclt?EvaluateOverlapBAN
 implies http://www.gap-system.org/lib?rwspcclt?EvaluateOverlapBAN http://www.gap-system.org/lib?rwspcclt?IsPolycyclicCollector
 implies http://www.gap-system.org/lib?rwspcclt?EvaluateOverlapBAN http://www.gap-system.org/lib?list?IsList
 implies http://www.gap-system.org/lib?rwspcclt?EvaluateOverlapBAN http://www.gap-system.org/lib?cyclotom?IsInt
+dataconstructor http://www.gap-system.org/lib?rwspcclt?IsPolycyclicCollector
+dataconstructor http://www.gap-system.org/lib?rwspcclt?IsPolycyclicCollector_st0
+dataconstructor http://www.gap-system.org/lib?rwspcclt?IsPolycyclicCollector_st1
+dataconstructor http://www.gap-system.org/lib?rwspcclt?IsPolycyclicCollector_st2
+dataconstructor http://www.gap-system.org/lib?rwspcclt?IsPolycyclicCollector_st3
+dataconstructor http://www.gap-system.org/lib?rwspcclt?IsPolycyclicCollector_st4
+dataconstructor http://www.gap-system.org/lib?rwspcclt?IsPolycyclicCollector_st5
+dataconstructor http://www.gap-system.org/lib?rwspcclt?IsPolycyclicCollector_st6
+dataconstructor http://www.gap-system.org/lib?rwspcclt?IsPolycyclicCollector_st7
+dataconstructor http://www.gap-system.org/lib?rwspcclt?IsPolycyclicCollector_st8
+dataconstructor http://www.gap-system.org/lib?rwspcclt?IsPolycyclicCollector_st9
+dataconstructor http://www.gap-system.org/lib?rwspcclt?UpdatePolycyclicCollector
+dataconstructor http://www.gap-system.org/lib?rwspcclt?NonTrivialRightHandSides
+dataconstructor http://www.gap-system.org/lib?rwspcclt?OutdatePolycyclicCollector
+dataconstructor http://www.gap-system.org/lib?rwspcclt?GetPowerNC
+dataconstructor http://www.gap-system.org/lib?rwspcclt?EvaluateOverlapANA
+dataconstructor http://www.gap-system.org/lib?rwspcclt?IsPowerConjugateCollector
+dataconstructor http://www.gap-system.org/lib?rwspcclt?IsPowerConjugateCollector_st0
+dataconstructor http://www.gap-system.org/lib?rwspcclt?IsPowerConjugateCollector_st1
+dataconstructor http://www.gap-system.org/lib?rwspcclt?IsPowerConjugateCollector_st2
+dataconstructor http://www.gap-system.org/lib?rwspcclt?IsPowerConjugateCollector_st3
+dataconstructor http://www.gap-system.org/lib?rwspcclt?IsPowerConjugateCollector_st4
+dataconstructor http://www.gap-system.org/lib?rwspcclt?IsPowerConjugateCollector_st5
+dataconstructor http://www.gap-system.org/lib?rwspcclt?IsPowerConjugateCollector_st6
+dataconstructor http://www.gap-system.org/lib?rwspcclt?IsPowerConjugateCollector_st7
+dataconstructor http://www.gap-system.org/lib?rwspcclt?IsPowerConjugateCollector_st8
+dataconstructor http://www.gap-system.org/lib?rwspcclt?IsPowerConjugateCollector_st9
+dataconstructor http://www.gap-system.org/lib?rwspcclt?IsPowerConjugateCollector_st10
+dataconstructor http://www.gap-system.org/lib?rwspcclt?CombinatorialCollector
+dataconstructor http://www.gap-system.org/lib?rwspcclt?GetConjugateNC
+dataconstructor http://www.gap-system.org/lib?rwspcclt?SingleCollectorByGenerators
+dataconstructor http://www.gap-system.org/lib?rwspcclt?SingleCollector
+dataconstructor http://www.gap-system.org/lib?rwspcclt?RelativeOrders
+dataconstructor http://www.gap-system.org/lib?rwspcclt?CombinatorialCollectorByGenerators
+dataconstructor http://www.gap-system.org/lib?rwspcclt?IsPowerCommutatorCollector
+dataconstructor http://www.gap-system.org/lib?rwspcclt?IsPowerCommutatorCollector_st0
+dataconstructor http://www.gap-system.org/lib?rwspcclt?IsPowerCommutatorCollector_st1
+dataconstructor http://www.gap-system.org/lib?rwspcclt?IsPowerCommutatorCollector_st2
+dataconstructor http://www.gap-system.org/lib?rwspcclt?IsPowerCommutatorCollector_st3
+dataconstructor http://www.gap-system.org/lib?rwspcclt?IsPowerCommutatorCollector_st4
+dataconstructor http://www.gap-system.org/lib?rwspcclt?IsPowerCommutatorCollector_st5
+dataconstructor http://www.gap-system.org/lib?rwspcclt?IsPowerCommutatorCollector_st6
+dataconstructor http://www.gap-system.org/lib?rwspcclt?IsPowerCommutatorCollector_st7
+dataconstructor http://www.gap-system.org/lib?rwspcclt?IsPowerCommutatorCollector_st8
+dataconstructor http://www.gap-system.org/lib?rwspcclt?IsPowerCommutatorCollector_st9
+dataconstructor http://www.gap-system.org/lib?rwspcclt?IsPowerCommutatorCollector_st10
+dataconstructor http://www.gap-system.org/lib?rwspcclt?CollectWordOrFail
+dataconstructor http://www.gap-system.org/lib?rwspcclt?ObjByExponents
+dataconstructor http://www.gap-system.org/lib?rwspcclt?GetCommutatorNC
+dataconstructor http://www.gap-system.org/lib?rwspcclt?EvaluateOverlapBNA
+dataconstructor http://www.gap-system.org/lib?rwspcclt?CollectWord
+dataconstructor http://www.gap-system.org/lib?rwspcclt?DeepThoughtCollectorByGenerators
+dataconstructor http://www.gap-system.org/lib?rwspcclt?DeepThoughtCollector
+dataconstructor http://www.gap-system.org/lib?rwspcclt?IsUpToDatePolycyclicCollector
+dataconstructor http://www.gap-system.org/lib?rwspcclt?EvaluateOverlapCBA
+dataconstructor http://www.gap-system.org/lib?rwspcclt?EvaluateOverlapBAN
 theory http://www.gap-system.org/lib?rwspcclt
 HasMeta http://www.gap-system.org/lib?rwspcclt http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?rwspcclt http://www.gap-system.org/lib?object
@@ -100,7 +156,6 @@ Declares http://www.gap-system.org/lib?rwspcclt http://www.gap-system.org/lib?rw
 constant http://www.gap-system.org/lib?rwspcclt?IsPolycyclicCollector_st8
 Declares http://www.gap-system.org/lib?rwspcclt http://www.gap-system.org/lib?rwspcclt?IsPolycyclicCollector_st9
 constant http://www.gap-system.org/lib?rwspcclt?IsPolycyclicCollector_st9
-Includes http://www.gap-system.org/lib?rwspcclt http://www.gap-system.org/lib?rwspcclt
 Declares http://www.gap-system.org/lib?rwspcclt http://www.gap-system.org/lib?rwspcclt?UpdatePolycyclicCollector
 constant http://www.gap-system.org/lib?rwspcclt?UpdatePolycyclicCollector
 Declares http://www.gap-system.org/lib?rwspcclt http://www.gap-system.org/lib?rwspcclt?NonTrivialRightHandSides
diff --git a/relational/http..www.gap-system.org/lib/rwspccoc.rel b/relational/http..www.gap-system.org/lib/rwspccoc.rel
index 73795c6bcdc11b9c8256a1d378a3401deb512aac..9c142b7a027a0fd94b10d74ea4ff3d3ad9b40d1d 100644
--- a/relational/http..www.gap-system.org/lib/rwspccoc.rel
+++ b/relational/http..www.gap-system.org/lib/rwspccoc.rel
@@ -1,6 +1,9 @@
 IsFilter http://www.gap-system.org/lib?rwspccoc?IsCombinatorialCollectorRep
 implies http://www.gap-system.org/lib?rwspccoc?IsCombinatorialCollectorRep_st1 http://www.gap-system.org/lib?type?IsPositionalObjectRep
 implies http://www.gap-system.org/lib?rwspccoc?IsCombinatorialCollectorRep_st1 http://www.gap-system.org/lib?rwspcsng?IsSingleCollectorRep
+dataconstructor http://www.gap-system.org/lib?rwspccoc?IsCombinatorialCollectorRep
+dataconstructor http://www.gap-system.org/lib?rwspccoc?IsCombinatorialCollectorRep_st0
+dataconstructor http://www.gap-system.org/lib?rwspccoc?IsCombinatorialCollectorRep_st1
 theory http://www.gap-system.org/lib?rwspccoc
 HasMeta http://www.gap-system.org/lib?rwspccoc http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?rwspccoc http://www.gap-system.org/lib?type
diff --git a/relational/http..www.gap-system.org/lib/rwspcgrp.rel b/relational/http..www.gap-system.org/lib/rwspcgrp.rel
index ec6183f75bc83be036538fa72c9ba9a1c2b689b3..19cf26dd53c9939f082e78385887c2deac01fa33 100644
--- a/relational/http..www.gap-system.org/lib/rwspcgrp.rel
+++ b/relational/http..www.gap-system.org/lib/rwspcgrp.rel
@@ -52,6 +52,51 @@ IsFilter http://www.gap-system.org/lib?rwspcgrp?Is8BitsPcWordRep
 implies http://www.gap-system.org/lib?rwspcgrp?Is8BitsPcWordRep_st2 http://www.gap-system.org/lib?type?IsDataObjectRep
 implies http://www.gap-system.org/lib?rwspcgrp?Is8BitsPcWordRep_st2 http://www.gap-system.org/lib?rwspcgrp?IsKernelPcWord
 implies http://www.gap-system.org/lib?rwspcgrp?Is8BitsPcWordRep_st2 http://www.gap-system.org/lib?rwspcgrp?IsNBitsPcWordRep
+dataconstructor http://www.gap-system.org/lib?rwspcgrp?IsNBitsPcWordRep
+dataconstructor http://www.gap-system.org/lib?rwspcgrp?IsNBitsPcWordRep_st0
+dataconstructor http://www.gap-system.org/lib?rwspcgrp?IsKernelPcWord
+dataconstructor http://www.gap-system.org/lib?rwspcgrp?PolycyclicFactorGroup
+dataconstructor http://www.gap-system.org/lib?rwspcgrp?PolycyclicFactorGroupByRelators
+dataconstructor http://www.gap-system.org/lib?rwspcgrp?IsMultiplicativeElementWithInverseByPolycyclicCollector
+dataconstructor http://www.gap-system.org/lib?rwspcgrp?IsMultiplicativeElementWithInverseByPolycyclicCollector_st0
+dataconstructor http://www.gap-system.org/lib?rwspcgrp?IsMultiplicativeElementWithInverseByPolycyclicCollector_st1
+dataconstructor http://www.gap-system.org/lib?rwspcgrp?IsMultiplicativeElementWithInverseByPolycyclicCollector_st2
+dataconstructor http://www.gap-system.org/lib?rwspcgrp?IsMultiplicativeElementWithInverseByPolycyclicCollector_st3
+dataconstructor http://www.gap-system.org/lib?rwspcgrp?IsMultiplicativeElementWithInverseByPolycyclicCollector_st4
+dataconstructor http://www.gap-system.org/lib?rwspcgrp?IsMultiplicativeElementWithInverseByPolycyclicCollector_st5
+dataconstructor http://www.gap-system.org/lib?rwspcgrp?IsMultiplicativeElementWithInverseByPolycyclicCollector_st6
+dataconstructor http://www.gap-system.org/lib?rwspcgrp?DefiningPcgs
+dataconstructor http://www.gap-system.org/lib?rwspcgrp?IsElementsFamilyBy8BitsSingleCollector
+dataconstructor http://www.gap-system.org/lib?rwspcgrp?IsElementsFamilyBy8BitsSingleCollector_st0
+dataconstructor http://www.gap-system.org/lib?rwspcgrp?IsElementsFamilyBy8BitsSingleCollector_st1
+dataconstructor http://www.gap-system.org/lib?rwspcgrp?Is32BitsPcWordRep
+dataconstructor http://www.gap-system.org/lib?rwspcgrp?Is32BitsPcWordRep_st0
+dataconstructor http://www.gap-system.org/lib?rwspcgrp?Is32BitsPcWordRep_st1
+dataconstructor http://www.gap-system.org/lib?rwspcgrp?Is32BitsPcWordRep_st2
+dataconstructor http://www.gap-system.org/lib?rwspcgrp?IsElementFinitePolycyclicGroup
+dataconstructor http://www.gap-system.org/lib?rwspcgrp?IsElementFinitePolycyclicGroup_st0
+dataconstructor http://www.gap-system.org/lib?rwspcgrp?IsElementFinitePolycyclicGroup_st1
+dataconstructor http://www.gap-system.org/lib?rwspcgrp?IsElementFinitePolycyclicGroup_st2
+dataconstructor http://www.gap-system.org/lib?rwspcgrp?IsElementFinitePolycyclicGroup_st3
+dataconstructor http://www.gap-system.org/lib?rwspcgrp?IsElementFinitePolycyclicGroup_st4
+dataconstructor http://www.gap-system.org/lib?rwspcgrp?IsElementFinitePolycyclicGroup_st5
+dataconstructor http://www.gap-system.org/lib?rwspcgrp?IsPcGroup
+dataconstructor http://www.gap-system.org/lib?rwspcgrp?PolycyclicFactorGroupNC
+dataconstructor http://www.gap-system.org/lib?rwspcgrp?Is16BitsPcWordRep
+dataconstructor http://www.gap-system.org/lib?rwspcgrp?Is16BitsPcWordRep_st0
+dataconstructor http://www.gap-system.org/lib?rwspcgrp?Is16BitsPcWordRep_st1
+dataconstructor http://www.gap-system.org/lib?rwspcgrp?Is16BitsPcWordRep_st2
+dataconstructor http://www.gap-system.org/lib?rwspcgrp?IsElementsFamilyBy32BitsSingleCollector
+dataconstructor http://www.gap-system.org/lib?rwspcgrp?IsElementsFamilyBy32BitsSingleCollector_st0
+dataconstructor http://www.gap-system.org/lib?rwspcgrp?IsElementsFamilyBy32BitsSingleCollector_st1
+dataconstructor http://www.gap-system.org/lib?rwspcgrp?PolycyclicFactorGroupByRelatorsNC
+dataconstructor http://www.gap-system.org/lib?rwspcgrp?IsElementsFamilyBy16BitsSingleCollector
+dataconstructor http://www.gap-system.org/lib?rwspcgrp?IsElementsFamilyBy16BitsSingleCollector_st0
+dataconstructor http://www.gap-system.org/lib?rwspcgrp?IsElementsFamilyBy16BitsSingleCollector_st1
+dataconstructor http://www.gap-system.org/lib?rwspcgrp?Is8BitsPcWordRep
+dataconstructor http://www.gap-system.org/lib?rwspcgrp?Is8BitsPcWordRep_st0
+dataconstructor http://www.gap-system.org/lib?rwspcgrp?Is8BitsPcWordRep_st1
+dataconstructor http://www.gap-system.org/lib?rwspcgrp?Is8BitsPcWordRep_st2
 theory http://www.gap-system.org/lib?rwspcgrp
 HasMeta http://www.gap-system.org/lib?rwspcgrp http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?rwspcgrp http://www.gap-system.org/lib?type
@@ -92,7 +137,6 @@ Declares http://www.gap-system.org/lib?rwspcgrp http://www.gap-system.org/lib?rw
 constant http://www.gap-system.org/lib?rwspcgrp?IsElementsFamilyBy8BitsSingleCollector_st0
 Declares http://www.gap-system.org/lib?rwspcgrp http://www.gap-system.org/lib?rwspcgrp?IsElementsFamilyBy8BitsSingleCollector_st1
 constant http://www.gap-system.org/lib?rwspcgrp?IsElementsFamilyBy8BitsSingleCollector_st1
-Includes http://www.gap-system.org/lib?rwspcgrp http://www.gap-system.org/lib?rwspcgrp
 Declares http://www.gap-system.org/lib?rwspcgrp http://www.gap-system.org/lib?rwspcgrp?Is32BitsPcWordRep
 constant http://www.gap-system.org/lib?rwspcgrp?Is32BitsPcWordRep
 Declares http://www.gap-system.org/lib?rwspcgrp http://www.gap-system.org/lib?rwspcgrp?Is32BitsPcWordRep_st0
diff --git a/relational/http..www.gap-system.org/lib/rwspcsng.rel b/relational/http..www.gap-system.org/lib/rwspcsng.rel
index 2b23ad5c290ab17879caa61584de6d6179831ccb..8e1cf0c1194f169864ebdaa0bb2c182f5484b07f 100644
--- a/relational/http..www.gap-system.org/lib/rwspcsng.rel
+++ b/relational/http..www.gap-system.org/lib/rwspcsng.rel
@@ -10,6 +10,18 @@ IsFilter http://www.gap-system.org/lib?rwspcsng?IsDefaultRhsTypeSingleCollector
 IsFilter http://www.gap-system.org/lib?rwspcsng?Is16BitsSingleCollectorRep
 implies http://www.gap-system.org/lib?rwspcsng?Is16BitsSingleCollectorRep_st1 http://www.gap-system.org/lib?type?IsPositionalObjectRep
 implies http://www.gap-system.org/lib?rwspcsng?Is16BitsSingleCollectorRep_st1 http://www.gap-system.org/lib?rwspcsng?IsSingleCollectorRep
+dataconstructor http://www.gap-system.org/lib?rwspcsng?IsSingleCollectorRep
+dataconstructor http://www.gap-system.org/lib?rwspcsng?IsSingleCollectorRep_st0
+dataconstructor http://www.gap-system.org/lib?rwspcsng?Is8BitsSingleCollectorRep
+dataconstructor http://www.gap-system.org/lib?rwspcsng?Is8BitsSingleCollectorRep_st0
+dataconstructor http://www.gap-system.org/lib?rwspcsng?Is8BitsSingleCollectorRep_st1
+dataconstructor http://www.gap-system.org/lib?rwspcsng?Is32BitsSingleCollectorRep
+dataconstructor http://www.gap-system.org/lib?rwspcsng?Is32BitsSingleCollectorRep_st0
+dataconstructor http://www.gap-system.org/lib?rwspcsng?Is32BitsSingleCollectorRep_st1
+dataconstructor http://www.gap-system.org/lib?rwspcsng?IsDefaultRhsTypeSingleCollector
+dataconstructor http://www.gap-system.org/lib?rwspcsng?Is16BitsSingleCollectorRep
+dataconstructor http://www.gap-system.org/lib?rwspcsng?Is16BitsSingleCollectorRep_st0
+dataconstructor http://www.gap-system.org/lib?rwspcsng?Is16BitsSingleCollectorRep_st1
 theory http://www.gap-system.org/lib?rwspcsng
 HasMeta http://www.gap-system.org/lib?rwspcsng http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?rwspcsng http://www.gap-system.org/lib?type
@@ -17,7 +29,6 @@ Declares http://www.gap-system.org/lib?rwspcsng http://www.gap-system.org/lib?rw
 constant http://www.gap-system.org/lib?rwspcsng?IsSingleCollectorRep
 Declares http://www.gap-system.org/lib?rwspcsng http://www.gap-system.org/lib?rwspcsng?IsSingleCollectorRep_st0
 constant http://www.gap-system.org/lib?rwspcsng?IsSingleCollectorRep_st0
-Includes http://www.gap-system.org/lib?rwspcsng http://www.gap-system.org/lib?rwspcsng
 Declares http://www.gap-system.org/lib?rwspcsng http://www.gap-system.org/lib?rwspcsng?Is8BitsSingleCollectorRep
 constant http://www.gap-system.org/lib?rwspcsng?Is8BitsSingleCollectorRep
 Declares http://www.gap-system.org/lib?rwspcsng http://www.gap-system.org/lib?rwspcsng?Is8BitsSingleCollectorRep_st0
diff --git a/relational/http..www.gap-system.org/lib/rwssmg.rel b/relational/http..www.gap-system.org/lib/rwssmg.rel
index ab24391745234339d4bf51f0cb0956a5d91e64e5..82ce8231ddc0efa695ddddf7220dbf95a5086994 100644
--- a/relational/http..www.gap-system.org/lib/rwssmg.rel
+++ b/relational/http..www.gap-system.org/lib/rwssmg.rel
@@ -7,6 +7,10 @@ implies http://www.gap-system.org/lib?rwssmg?FamilyForRewritingSystem http://www
 IsAttribute http://www.gap-system.org/lib?rwssmg?ReducedConfluentRewritingSystem
 implies http://www.gap-system.org/lib?rwssmg?ReducedConfluentRewritingSystem http://www.gap-system.org/lib?magma?IsMagma
 implies http://www.gap-system.org/lib?rwssmg?ReducedConfluentRewritingSystem http://www.gap-system.org/lib?magma?IsAssociative
+dataconstructor http://www.gap-system.org/lib?rwssmg?FreeSemigroupOfRewritingSystem
+dataconstructor http://www.gap-system.org/lib?rwssmg?FreeMonoidOfRewritingSystem
+dataconstructor http://www.gap-system.org/lib?rwssmg?FamilyForRewritingSystem
+dataconstructor http://www.gap-system.org/lib?rwssmg?ReducedConfluentRewritingSystem
 theory http://www.gap-system.org/lib?rwssmg
 HasMeta http://www.gap-system.org/lib?rwssmg http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?rwssmg http://www.gap-system.org/lib?rws
diff --git a/relational/http..www.gap-system.org/lib/schur.rel b/relational/http..www.gap-system.org/lib/schur.rel
index 053464a759a146bd758caa170ebfdfd29ee8149f..e2e5cf2a41f0f4e0a5791a12fd8f127b2cedffe9 100644
--- a/relational/http..www.gap-system.org/lib/schur.rel
+++ b/relational/http..www.gap-system.org/lib/schur.rel
@@ -19,6 +19,13 @@ implies http://www.gap-system.org/lib?schur?AbelianInvariantsMultiplier http://w
 IsAttribute http://www.gap-system.org/lib?schur?SchurCover
 implies http://www.gap-system.org/lib?schur?SchurCover http://www.gap-system.org/lib?magma?IsMagmaWithInverses
 implies http://www.gap-system.org/lib?schur?SchurCover http://www.gap-system.org/lib?magma?IsAssociative
+dataconstructor http://www.gap-system.org/lib?schur?NonabelianExteriorSquare
+dataconstructor http://www.gap-system.org/lib?schur?Epicentre
+dataconstructor http://www.gap-system.org/lib?schur?EpimorphismSchurCover
+dataconstructor http://www.gap-system.org/lib?schur?EpimorphismNonabelianExteriorSquare
+dataconstructor http://www.gap-system.org/lib?schur?IsCentralFactor
+dataconstructor http://www.gap-system.org/lib?schur?AbelianInvariantsMultiplier
+dataconstructor http://www.gap-system.org/lib?schur?SchurCover
 theory http://www.gap-system.org/lib?schur
 HasMeta http://www.gap-system.org/lib?schur http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?schur http://www.gap-system.org/lib?magma
diff --git a/relational/http..www.gap-system.org/lib/schursym.rel b/relational/http..www.gap-system.org/lib/schursym.rel
index e811e5167699cacc505c441e1b885b0c6c33819c..cb70cd70255ff5060e00a3c5c8792d65fc11bc39 100644
--- a/relational/http..www.gap-system.org/lib/schursym.rel
+++ b/relational/http..www.gap-system.org/lib/schursym.rel
@@ -4,6 +4,8 @@ implies http://www.gap-system.org/lib?schursym?SchurCoverOfSymmetricGroup http:/
 IsAttribute http://www.gap-system.org/lib?schursym?DoubleCoverOfAlternatingGroup
 implies http://www.gap-system.org/lib?schursym?DoubleCoverOfAlternatingGroup http://www.gap-system.org/lib?cyclotom?IsInt
 implies http://www.gap-system.org/lib?schursym?DoubleCoverOfAlternatingGroup http://www.gap-system.org/lib?cyclotom?IsPosRat
+dataconstructor http://www.gap-system.org/lib?schursym?SchurCoverOfSymmetricGroup
+dataconstructor http://www.gap-system.org/lib?schursym?DoubleCoverOfAlternatingGroup
 theory http://www.gap-system.org/lib?schursym
 HasMeta http://www.gap-system.org/lib?schursym http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?schursym http://www.gap-system.org/lib?cyclotom
diff --git a/relational/http..www.gap-system.org/lib/semicong.rel b/relational/http..www.gap-system.org/lib/semicong.rel
index f09828c91ed03eafede08efde48e2ffcf19fd198..2e3b773341df05d2a6007b948086fbf1d58af3b4 100644
--- a/relational/http..www.gap-system.org/lib/semicong.rel
+++ b/relational/http..www.gap-system.org/lib/semicong.rel
@@ -18,12 +18,18 @@ IsAttribute http://www.gap-system.org/lib?semicong?LeftSemigroupCongruenceByGene
 implies http://www.gap-system.org/lib?semicong?LeftSemigroupCongruenceByGeneratingPairs http://www.gap-system.org/lib?magma?IsMagma
 implies http://www.gap-system.org/lib?semicong?LeftSemigroupCongruenceByGeneratingPairs http://www.gap-system.org/lib?magma?IsAssociative
 implies http://www.gap-system.org/lib?semicong?LeftSemigroupCongruenceByGeneratingPairs http://www.gap-system.org/lib?list?IsList
+dataconstructor http://www.gap-system.org/lib?semicong?IsSemigroupCongruence
+dataconstructor http://www.gap-system.org/lib?semicong?IsReesCongruence
+dataconstructor http://www.gap-system.org/lib?semicong?SemigroupCongruenceByGeneratingPairs
+dataconstructor http://www.gap-system.org/lib?semicong?RightSemigroupCongruenceByGeneratingPairs
+dataconstructor http://www.gap-system.org/lib?semicong?IsRightSemigroupCongruence
+dataconstructor http://www.gap-system.org/lib?semicong?IsLeftSemigroupCongruence
+dataconstructor http://www.gap-system.org/lib?semicong?LeftSemigroupCongruenceByGeneratingPairs
 theory http://www.gap-system.org/lib?semicong
 HasMeta http://www.gap-system.org/lib?semicong http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?semicong http://www.gap-system.org/lib?mgmcong
 Declares http://www.gap-system.org/lib?semicong http://www.gap-system.org/lib?semicong?IsSemigroupCongruence
 constant http://www.gap-system.org/lib?semicong?IsSemigroupCongruence
-Includes http://www.gap-system.org/lib?semicong http://www.gap-system.org/lib?semicong
 Declares http://www.gap-system.org/lib?semicong http://www.gap-system.org/lib?semicong?IsReesCongruence
 constant http://www.gap-system.org/lib?semicong?IsReesCongruence
 Includes http://www.gap-system.org/lib?semicong http://www.gap-system.org/lib?magma
diff --git a/relational/http..www.gap-system.org/lib/semigrp.rel b/relational/http..www.gap-system.org/lib/semigrp.rel
index 90f3fc159547c1841fa2fe950bba2e54854498bd..c4f93b6dabb3335e8daeb25f8dae59e54264a885 100644
--- a/relational/http..www.gap-system.org/lib/semigrp.rel
+++ b/relational/http..www.gap-system.org/lib/semigrp.rel
@@ -130,6 +130,49 @@ implies http://www.gap-system.org/lib?semigrp?SemigroupViewStringPrefix http://w
 IsAttribute http://www.gap-system.org/lib?semigrp?ANonReesCongruenceOfSemigroup
 implies http://www.gap-system.org/lib?semigrp?ANonReesCongruenceOfSemigroup http://www.gap-system.org/lib?magma?IsMagma
 implies http://www.gap-system.org/lib?semigrp?ANonReesCongruenceOfSemigroup http://www.gap-system.org/lib?magma?IsAssociative
+dataconstructor http://www.gap-system.org/lib?semigrp?IsRegularSemigroupElement
+dataconstructor http://www.gap-system.org/lib?semigrp?IsRegularSemigroup
+dataconstructor http://www.gap-system.org/lib?semigrp?IsZeroSimpleSemigroup
+dataconstructor http://www.gap-system.org/lib?semigrp?IsGeneratorsOfSemigroup
+dataconstructor http://www.gap-system.org/lib?semigrp?IsMonoidAsSemigroup
+dataconstructor http://www.gap-system.org/lib?semigrp?IsSimpleSemigroup
+dataconstructor http://www.gap-system.org/lib?semigrp?IsInverseSemigroup
+dataconstructor http://www.gap-system.org/lib?semigrp?IsCompletelyRegularSemigroup
+dataconstructor http://www.gap-system.org/lib?semigrp?IsGroupAsSemigroup
+dataconstructor http://www.gap-system.org/lib?semigrp?IsOrthodoxSemigroup
+dataconstructor http://www.gap-system.org/lib?semigrp?FactorSemigroup
+dataconstructor http://www.gap-system.org/lib?semigrp?AsSemigroup
+dataconstructor http://www.gap-system.org/lib?semigrp?CayleyGraphDualSemigroup
+dataconstructor http://www.gap-system.org/lib?semigrp?AsSubsemigroup
+dataconstructor http://www.gap-system.org/lib?semigrp?IsReesCongruenceSemigroup
+dataconstructor http://www.gap-system.org/lib?semigrp?SemigroupByGenerators
+dataconstructor http://www.gap-system.org/lib?semigrp?IsSubsemigroup
+dataconstructor http://www.gap-system.org/lib?semigrp?IsCliffordSemigroup
+dataconstructor http://www.gap-system.org/lib?semigrp?IsMonogenicSemigroup
+dataconstructor http://www.gap-system.org/lib?semigrp?CayleyGraphSemigroup
+dataconstructor http://www.gap-system.org/lib?semigrp?HomomorphismFactorSemigroupByClosure
+dataconstructor http://www.gap-system.org/lib?semigrp?IsCompletelySimpleSemigroup
+dataconstructor http://www.gap-system.org/lib?semigrp?IsRectangularBand
+dataconstructor http://www.gap-system.org/lib?semigrp?DisplaySemigroup
+dataconstructor http://www.gap-system.org/lib?semigrp?IsNilpotentSemigroup
+dataconstructor http://www.gap-system.org/lib?semigrp?IsSemigroup
+dataconstructor http://www.gap-system.org/lib?semigrp?IsSemilattice
+dataconstructor http://www.gap-system.org/lib?semigrp?HomomorphismFactorSemigroup
+dataconstructor http://www.gap-system.org/lib?semigrp?IsLeftZeroSemigroup
+dataconstructor http://www.gap-system.org/lib?semigrp?IsBand
+dataconstructor http://www.gap-system.org/lib?semigrp?IsCommutativeSemigroup
+dataconstructor http://www.gap-system.org/lib?semigrp?IsZeroSemigroup
+dataconstructor http://www.gap-system.org/lib?semigrp?IsZeroGroup
+dataconstructor http://www.gap-system.org/lib?semigrp?IsIdempotentGenerated
+dataconstructor http://www.gap-system.org/lib?semigrp?IsBrandtSemigroup
+dataconstructor http://www.gap-system.org/lib?semigrp?NilpotencyDegree
+dataconstructor http://www.gap-system.org/lib?semigrp?FactorSemigroupByClosure
+dataconstructor http://www.gap-system.org/lib?semigrp?IsRightZeroSemigroup
+dataconstructor http://www.gap-system.org/lib?semigrp?IsSemiband
+dataconstructor http://www.gap-system.org/lib?semigrp?InversesOfSemigroupElement
+dataconstructor http://www.gap-system.org/lib?semigrp?SemigroupViewStringSuffix
+dataconstructor http://www.gap-system.org/lib?semigrp?SemigroupViewStringPrefix
+dataconstructor http://www.gap-system.org/lib?semigrp?ANonReesCongruenceOfSemigroup
 theory http://www.gap-system.org/lib?semigrp
 HasMeta http://www.gap-system.org/lib?semigrp http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?semigrp http://www.gap-system.org/lib?magma
diff --git a/relational/http..www.gap-system.org/lib/semipperm.rel b/relational/http..www.gap-system.org/lib/semipperm.rel
index 0764c8c12f3e5c421e18bccfd29b7ad2be84db56..8505df8c4265292c65ea299cc7498f0b39d111ad 100644
--- a/relational/http..www.gap-system.org/lib/semipperm.rel
+++ b/relational/http..www.gap-system.org/lib/semipperm.rel
@@ -30,6 +30,15 @@ IsAttribute http://www.gap-system.org/lib?semipperm?IsSymmetricInverseSemigroup
 implies http://www.gap-system.org/lib?semipperm?IsSymmetricInverseSemigroup http://www.gap-system.org/lib?pperm?IsPartialPerm
 implies http://www.gap-system.org/lib?semipperm?IsSymmetricInverseSemigroup http://www.gap-system.org/lib?magma?IsMagma
 implies http://www.gap-system.org/lib?semipperm?IsSymmetricInverseSemigroup http://www.gap-system.org/lib?magma?IsAssociative
+dataconstructor http://www.gap-system.org/lib?semipperm?IsomorphismPartialPermMonoid
+dataconstructor http://www.gap-system.org/lib?semipperm?IsPartialPermMonoid
+dataconstructor http://www.gap-system.org/lib?semipperm?CodegreeOfPartialPermSemigroup
+dataconstructor http://www.gap-system.org/lib?semipperm?SymmetricInverseSemigroup
+dataconstructor http://www.gap-system.org/lib?semipperm?IsPartialPermSemigroup
+dataconstructor http://www.gap-system.org/lib?semipperm?RankOfPartialPermSemigroup
+dataconstructor http://www.gap-system.org/lib?semipperm?IsomorphismPartialPermSemigroup
+dataconstructor http://www.gap-system.org/lib?semipperm?DegreeOfPartialPermSemigroup
+dataconstructor http://www.gap-system.org/lib?semipperm?IsSymmetricInverseSemigroup
 theory http://www.gap-system.org/lib?semipperm
 HasMeta http://www.gap-system.org/lib?semipperm http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?semipperm http://www.gap-system.org/lib?magma
diff --git a/relational/http..www.gap-system.org/lib/semiquo.rel b/relational/http..www.gap-system.org/lib/semiquo.rel
index 5ad11fad0400b6a2c30b23d853b5735b7357a722..3a81b98244f0ed8b96e82441507f84fb611ebfd3 100644
--- a/relational/http..www.gap-system.org/lib/semiquo.rel
+++ b/relational/http..www.gap-system.org/lib/semiquo.rel
@@ -15,6 +15,25 @@ IsAttribute http://www.gap-system.org/lib?semiquo?QuotientSemigroupHomomorphism
 implies http://www.gap-system.org/lib?semiquo?QuotientSemigroupHomomorphism http://www.gap-system.org/lib?semiquo?IsQuotientSemigroup
 IsAttribute http://www.gap-system.org/lib?semiquo?QuotientSemigroupCongruence
 implies http://www.gap-system.org/lib?semiquo?QuotientSemigroupCongruence http://www.gap-system.org/lib?semiquo?IsQuotientSemigroup
+dataconstructor http://www.gap-system.org/lib?semiquo?IsQuotientSemigroup
+dataconstructor http://www.gap-system.org/lib?semiquo?IsQuotientSemigroup_st0
+dataconstructor http://www.gap-system.org/lib?semiquo?IsQuotientSemigroup_st1
+dataconstructor http://www.gap-system.org/lib?semiquo?IsQuotientSemigroup_st2
+dataconstructor http://www.gap-system.org/lib?semiquo?IsQuotientSemigroup_st3
+dataconstructor http://www.gap-system.org/lib?semiquo?IsQuotientSemigroup_st4
+dataconstructor http://www.gap-system.org/lib?semiquo?IsQuotientSemigroup_st5
+dataconstructor http://www.gap-system.org/lib?semiquo?IsQuotientSemigroup_st6
+dataconstructor http://www.gap-system.org/lib?semiquo?IsQuotientSemigroup_st7
+dataconstructor http://www.gap-system.org/lib?semiquo?IsQuotientSemigroup_st8
+dataconstructor http://www.gap-system.org/lib?semiquo?IsQuotientSemigroup_st9
+dataconstructor http://www.gap-system.org/lib?semiquo?IsQuotientSemigroup_st10
+dataconstructor http://www.gap-system.org/lib?semiquo?IsQuotientSemigroup_st11
+dataconstructor http://www.gap-system.org/lib?semiquo?IsQuotientSemigroup_st12
+dataconstructor http://www.gap-system.org/lib?semiquo?IsQuotientSemigroup_st13
+dataconstructor http://www.gap-system.org/lib?semiquo?IsQuotientSemigroup_st14
+dataconstructor http://www.gap-system.org/lib?semiquo?QuotientSemigroupPreimage
+dataconstructor http://www.gap-system.org/lib?semiquo?QuotientSemigroupHomomorphism
+dataconstructor http://www.gap-system.org/lib?semiquo?QuotientSemigroupCongruence
 theory http://www.gap-system.org/lib?semiquo
 HasMeta http://www.gap-system.org/lib?semiquo http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?semiquo http://www.gap-system.org/lib?coll
@@ -55,7 +74,6 @@ Declares http://www.gap-system.org/lib?semiquo http://www.gap-system.org/lib?sem
 constant http://www.gap-system.org/lib?semiquo?IsQuotientSemigroup_st13
 Declares http://www.gap-system.org/lib?semiquo http://www.gap-system.org/lib?semiquo?IsQuotientSemigroup_st14
 constant http://www.gap-system.org/lib?semiquo?IsQuotientSemigroup_st14
-Includes http://www.gap-system.org/lib?semiquo http://www.gap-system.org/lib?semiquo
 Declares http://www.gap-system.org/lib?semiquo http://www.gap-system.org/lib?semiquo?QuotientSemigroupPreimage
 constant http://www.gap-system.org/lib?semiquo?QuotientSemigroupPreimage
 Declares http://www.gap-system.org/lib?semiquo http://www.gap-system.org/lib?semiquo?QuotientSemigroupHomomorphism
diff --git a/relational/http..www.gap-system.org/lib/semirel.rel b/relational/http..www.gap-system.org/lib/semirel.rel
index 4009bfeb1f080bc02533d39f42e7eb2503e6732d..8acf2a852482ce5005b13917463a64adbfd7ca8d 100644
--- a/relational/http..www.gap-system.org/lib/semirel.rel
+++ b/relational/http..www.gap-system.org/lib/semirel.rel
@@ -216,6 +216,202 @@ implies http://www.gap-system.org/lib?semirel?GreensLClasses http://www.gap-syst
 implies http://www.gap-system.org/lib?semirel?GreensLClasses http://www.gap-system.org/lib?semirel?IsGreensDClass
 IsAttribute http://www.gap-system.org/lib?semirel?IsFpMonoidReducedElt
 implies http://www.gap-system.org/lib?semirel?IsFpMonoidReducedElt http://www.gap-system.org/lib?fpmon?IsElementOfFpMonoid
+dataconstructor http://www.gap-system.org/lib?semirel?GreensLRelation
+dataconstructor http://www.gap-system.org/lib?semirel?IsFpSemigpReducedElt
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensRelation
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensRelation_st0
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensRelation_st1
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensRelation_st2
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensRelation_st3
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensRelation_st4
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensRelation_st5
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensRelation_st6
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensRelation_st7
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensRelation_st8
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensRelation_st9
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensRelation_st10
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensRelation_st11
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensRelation_st12
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensRelation_st13
+dataconstructor http://www.gap-system.org/lib?semirel?GreensRRelation
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensClass
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensClass_st0
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensClass_st1
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensClass_st2
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensClass_st3
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensClass_st4
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensClass_st5
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensJClass
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensJClass_st0
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensJClass_st1
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensJClass_st2
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensJClass_st3
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensJClass_st4
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensJClass_st5
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensJClass_st6
+dataconstructor http://www.gap-system.org/lib?semirel?DisplayEggBoxesOfSemigroup
+dataconstructor http://www.gap-system.org/lib?semirel?FroidurePinSimpleAlg
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensDClass
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensDClass_st0
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensDClass_st1
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensDClass_st2
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensDClass_st3
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensDClass_st4
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensDClass_st5
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensDClass_st6
+dataconstructor http://www.gap-system.org/lib?semirel?GreensRClasses
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensRClass
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensRClass_st0
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensRClass_st1
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensRClass_st2
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensRClass_st3
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensRClass_st4
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensRClass_st5
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensRClass_st6
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensDRelation
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensDRelation_st0
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensDRelation_st1
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensDRelation_st2
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensDRelation_st3
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensDRelation_st4
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensDRelation_st5
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensDRelation_st6
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensDRelation_st7
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensDRelation_st8
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensDRelation_st9
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensDRelation_st10
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensDRelation_st11
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensDRelation_st12
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensDRelation_st13
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensDRelation_st14
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensHClass
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensHClass_st0
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensHClass_st1
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensHClass_st2
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensHClass_st3
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensHClass_st4
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensHClass_st5
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensHClass_st6
+dataconstructor http://www.gap-system.org/lib?semirel?LClassOfHClass
+dataconstructor http://www.gap-system.org/lib?semirel?AssociatedFpSemigroup
+dataconstructor http://www.gap-system.org/lib?semirel?InternalRepGreensRelation
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensHRelation
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensHRelation_st0
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensHRelation_st1
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensHRelation_st2
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensHRelation_st3
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensHRelation_st4
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensHRelation_st5
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensHRelation_st6
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensHRelation_st7
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensHRelation_st8
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensHRelation_st9
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensHRelation_st10
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensHRelation_st11
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensHRelation_st12
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensHRelation_st13
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensHRelation_st14
+dataconstructor http://www.gap-system.org/lib?semirel?GreensDClassOfElement
+dataconstructor http://www.gap-system.org/lib?semirel?GreensDClasses
+dataconstructor http://www.gap-system.org/lib?semirel?GreensRClassOfElement
+dataconstructor http://www.gap-system.org/lib?semirel?IsGroupHClass
+dataconstructor http://www.gap-system.org/lib?semirel?GreensHClassOfElement
+dataconstructor http://www.gap-system.org/lib?semirel?EggBoxOfDClass
+dataconstructor http://www.gap-system.org/lib?semirel?GreensDRelation
+dataconstructor http://www.gap-system.org/lib?semirel?IsSemigroupGeneralMapping
+dataconstructor http://www.gap-system.org/lib?semirel?CanonicalGreensClass
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensLessThanOrEqual
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensLClass
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensLClass_st0
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensLClass_st1
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensLClass_st2
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensLClass_st3
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensLClass_st4
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensLClass_st5
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensLClass_st6
+dataconstructor http://www.gap-system.org/lib?semirel?SemigroupHomomorphismByImagesNC
+dataconstructor http://www.gap-system.org/lib?semirel?IsSemigroupHomomorphismByImagesRep
+dataconstructor http://www.gap-system.org/lib?semirel?IsSemigroupHomomorphismByImagesRep_st0
+dataconstructor http://www.gap-system.org/lib?semirel?IsSemigroupHomomorphismByImagesRep_st1
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensJRelation
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensJRelation_st0
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensJRelation_st1
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensJRelation_st2
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensJRelation_st3
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensJRelation_st4
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensJRelation_st5
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensJRelation_st6
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensJRelation_st7
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensJRelation_st8
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensJRelation_st9
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensJRelation_st10
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensJRelation_st11
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensJRelation_st12
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensJRelation_st13
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensJRelation_st14
+dataconstructor http://www.gap-system.org/lib?semirel?GreensLClassOfElement
+dataconstructor http://www.gap-system.org/lib?semirel?GreensJClassOfElement
+dataconstructor http://www.gap-system.org/lib?semirel?RClassOfHClass
+dataconstructor http://www.gap-system.org/lib?semirel?DClassOfHClass
+dataconstructor http://www.gap-system.org/lib?semirel?FroidurePinExtendedAlg
+dataconstructor http://www.gap-system.org/lib?semirel?GreensHClasses
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensLRelation
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensLRelation_st0
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensLRelation_st1
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensLRelation_st2
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensLRelation_st3
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensLRelation_st4
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensLRelation_st5
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensLRelation_st6
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensLRelation_st7
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensLRelation_st8
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensLRelation_st9
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensLRelation_st10
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensLRelation_st11
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensLRelation_st12
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensLRelation_st13
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensLRelation_st14
+dataconstructor http://www.gap-system.org/lib?semirel?AssociatedConcreteSemigroup
+dataconstructor http://www.gap-system.org/lib?semirel?DClassOfRClass
+dataconstructor http://www.gap-system.org/lib?semirel?DClassOfLClass
+dataconstructor http://www.gap-system.org/lib?semirel?GreensHRelation
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensRRelation
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensRRelation_st0
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensRRelation_st1
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensRRelation_st2
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensRRelation_st3
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensRRelation_st4
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensRRelation_st5
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensRRelation_st6
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensRRelation_st7
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensRRelation_st8
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensRRelation_st9
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensRRelation_st10
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensRRelation_st11
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensRRelation_st12
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensRRelation_st13
+dataconstructor http://www.gap-system.org/lib?semirel?IsGreensRRelation_st14
+dataconstructor http://www.gap-system.org/lib?semirel?GroupHClassOfGreensDClass
+dataconstructor http://www.gap-system.org/lib?semirel?IsSemigroupGeneralMappingRep
+dataconstructor http://www.gap-system.org/lib?semirel?IsSemigroupGeneralMappingRep_st0
+dataconstructor http://www.gap-system.org/lib?semirel?IsSemigroupGeneralMappingRep_st1
+dataconstructor http://www.gap-system.org/lib?semirel?IsSemigroupGeneralMappingRep_st2
+dataconstructor http://www.gap-system.org/lib?semirel?IsSemigroupGeneralMappingRep_st3
+dataconstructor http://www.gap-system.org/lib?semirel?IsSemigroupGeneralMappingRep_st4
+dataconstructor http://www.gap-system.org/lib?semirel?IsSemigroupGeneralMappingRep_st5
+dataconstructor http://www.gap-system.org/lib?semirel?IsSemigroupGeneralMappingRep_st6
+dataconstructor http://www.gap-system.org/lib?semirel?IsSemigroupGeneralMappingRep_st7
+dataconstructor http://www.gap-system.org/lib?semirel?IsSemigroupGeneralMappingRep_st8
+dataconstructor http://www.gap-system.org/lib?semirel?IsSemigroupGeneralMappingRep_st9
+dataconstructor http://www.gap-system.org/lib?semirel?IsSemigroupGeneralMappingRep_st10
+dataconstructor http://www.gap-system.org/lib?semirel?IsSemigroupGeneralMappingRep_st11
+dataconstructor http://www.gap-system.org/lib?semirel?GreensJClasses
+dataconstructor http://www.gap-system.org/lib?semirel?IsRegularDClass
+dataconstructor http://www.gap-system.org/lib?semirel?IsFiniteSemigroupGreensRelation
+dataconstructor http://www.gap-system.org/lib?semirel?GreensJRelation
+dataconstructor http://www.gap-system.org/lib?semirel?IsSemigroupHomomorphism
+dataconstructor http://www.gap-system.org/lib?semirel?GreensLClasses
+dataconstructor http://www.gap-system.org/lib?semirel?IsFpMonoidReducedElt
 theory http://www.gap-system.org/lib?semirel
 HasMeta http://www.gap-system.org/lib?semirel http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?semirel http://www.gap-system.org/lib?magma
@@ -275,7 +471,6 @@ Declares http://www.gap-system.org/lib?semirel http://www.gap-system.org/lib?sem
 constant http://www.gap-system.org/lib?semirel?IsGreensClass_st4
 Declares http://www.gap-system.org/lib?semirel http://www.gap-system.org/lib?semirel?IsGreensClass_st5
 constant http://www.gap-system.org/lib?semirel?IsGreensClass_st5
-Includes http://www.gap-system.org/lib?semirel http://www.gap-system.org/lib?semirel
 Declares http://www.gap-system.org/lib?semirel http://www.gap-system.org/lib?semirel?IsGreensJClass
 constant http://www.gap-system.org/lib?semirel?IsGreensJClass
 Declares http://www.gap-system.org/lib?semirel http://www.gap-system.org/lib?semirel?IsGreensJClass_st0
diff --git a/relational/http..www.gap-system.org/lib/semiring.rel b/relational/http..www.gap-system.org/lib/semiring.rel
index d34b54b3690f7b9e686942dbe5771af9acb5ded4..96b8d552d59e0c592c234e45a141cd77d6f7f88e 100644
--- a/relational/http..www.gap-system.org/lib/semiring.rel
+++ b/relational/http..www.gap-system.org/lib/semiring.rel
@@ -97,6 +97,27 @@ implies http://www.gap-system.org/lib?semiring?IsSemiringWithOneAndZero http://w
 implies http://www.gap-system.org/lib?semiring?IsSemiringWithOneAndZero http://www.gap-system.org/lib?addmagma?IsAdditivelyCommutative
 implies http://www.gap-system.org/lib?semiring?IsSemiringWithOneAndZero http://www.gap-system.org/lib?semiring?IsLDistributive
 implies http://www.gap-system.org/lib?semiring?IsSemiringWithOneAndZero http://www.gap-system.org/lib?semiring?IsRDistributive
+dataconstructor http://www.gap-system.org/lib?semiring?IsLDistributive
+dataconstructor http://www.gap-system.org/lib?semiring?IsRDistributive
+dataconstructor http://www.gap-system.org/lib?semiring?AsSemiringWithZero
+dataconstructor http://www.gap-system.org/lib?semiring?GeneratorsOfSemiringWithZero
+dataconstructor http://www.gap-system.org/lib?semiring?ClosureSemiring
+dataconstructor http://www.gap-system.org/lib?semiring?SemiringWithOneAndZeroByGenerators
+dataconstructor http://www.gap-system.org/lib?semiring?IsSemiringWithZero
+dataconstructor http://www.gap-system.org/lib?semiring?IsSemiringWithOne
+dataconstructor http://www.gap-system.org/lib?semiring?GeneratorsOfSemiringWithOne
+dataconstructor http://www.gap-system.org/lib?semiring?CentralIdempotentsOfSemiring
+dataconstructor http://www.gap-system.org/lib?semiring?IsSemiring
+dataconstructor http://www.gap-system.org/lib?semiring?GeneratorsOfSemiring
+dataconstructor http://www.gap-system.org/lib?semiring?SemiringWithOneByGenerators
+dataconstructor http://www.gap-system.org/lib?semiring?AsSemiringWithOne
+dataconstructor http://www.gap-system.org/lib?semiring?IsDistributive
+dataconstructor http://www.gap-system.org/lib?semiring?SemiringWithZeroByGenerators
+dataconstructor http://www.gap-system.org/lib?semiring?AsSemiring
+dataconstructor http://www.gap-system.org/lib?semiring?AsSemiringWithOneAndZero
+dataconstructor http://www.gap-system.org/lib?semiring?SemiringByGenerators
+dataconstructor http://www.gap-system.org/lib?semiring?GeneratorsOfSemiringWithOneAndZero
+dataconstructor http://www.gap-system.org/lib?semiring?IsSemiringWithOneAndZero
 theory http://www.gap-system.org/lib?semiring
 HasMeta http://www.gap-system.org/lib?semiring http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?semiring http://www.gap-system.org/lib?arith
@@ -108,7 +129,6 @@ Declares http://www.gap-system.org/lib?semiring http://www.gap-system.org/lib?se
 constant http://www.gap-system.org/lib?semiring?AsSemiringWithZero
 Includes http://www.gap-system.org/lib?semiring http://www.gap-system.org/lib?magma
 Includes http://www.gap-system.org/lib?semiring http://www.gap-system.org/lib?addmagma
-Includes http://www.gap-system.org/lib?semiring http://www.gap-system.org/lib?semiring
 Declares http://www.gap-system.org/lib?semiring http://www.gap-system.org/lib?semiring?GeneratorsOfSemiringWithZero
 constant http://www.gap-system.org/lib?semiring?GeneratorsOfSemiringWithZero
 Declares http://www.gap-system.org/lib?semiring http://www.gap-system.org/lib?semiring?ClosureSemiring
diff --git a/relational/http..www.gap-system.org/lib/semitran.rel b/relational/http..www.gap-system.org/lib/semitran.rel
index 5010c0e0480019a41162f5092a7cda5796649357..93ca94214c223527eb632a26f591d60183c88168 100644
--- a/relational/http..www.gap-system.org/lib/semitran.rel
+++ b/relational/http..www.gap-system.org/lib/semitran.rel
@@ -26,6 +26,14 @@ IsFilter http://www.gap-system.org/lib?semitran?IsTransformationSemigroup
 implies http://www.gap-system.org/lib?semitran?IsTransformationSemigroup http://www.gap-system.org/lib?trans?IsTransformation
 implies http://www.gap-system.org/lib?semitran?IsTransformationSemigroup http://www.gap-system.org/lib?magma?IsMagma
 implies http://www.gap-system.org/lib?semitran?IsTransformationSemigroup http://www.gap-system.org/lib?magma?IsAssociative
+dataconstructor http://www.gap-system.org/lib?semitran?IsomorphismTransformationMonoid
+dataconstructor http://www.gap-system.org/lib?semitran?IsTransformationMonoid
+dataconstructor http://www.gap-system.org/lib?semitran?IsomorphismTransformationSemigroup
+dataconstructor http://www.gap-system.org/lib?semitran?HomomorphismTransformationSemigroup
+dataconstructor http://www.gap-system.org/lib?semitran?AntiIsomorphismTransformationSemigroup
+dataconstructor http://www.gap-system.org/lib?semitran?DegreeOfTransformationSemigroup
+dataconstructor http://www.gap-system.org/lib?semitran?IsFullTransformationSemigroup
+dataconstructor http://www.gap-system.org/lib?semitran?IsTransformationSemigroup
 theory http://www.gap-system.org/lib?semitran
 HasMeta http://www.gap-system.org/lib?semitran http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?semitran http://www.gap-system.org/lib?magma
diff --git a/relational/http..www.gap-system.org/lib/set.rel b/relational/http..www.gap-system.org/lib/set.rel
index 9ea22308379d44f91e73d46abdb39d2a5becf617..a1eaeb97c6c334f5d42ea61f2ff2a8dc1b04bf38 100644
--- a/relational/http..www.gap-system.org/lib/set.rel
+++ b/relational/http..www.gap-system.org/lib/set.rel
@@ -17,6 +17,13 @@ implies http://www.gap-system.org/lib?set?SubtractSet http://www.gap-system.org/
 implies http://www.gap-system.org/lib?set?SubtractSet http://www.gap-system.org/lib?list?IsList
 IsAttribute http://www.gap-system.org/lib?set?IsSubsetSet
 implies http://www.gap-system.org/lib?set?IsSubsetSet http://www.gap-system.org/lib?list?IsList
+dataconstructor http://www.gap-system.org/lib?set?IntersectSet
+dataconstructor http://www.gap-system.org/lib?set?RemoveSet
+dataconstructor http://www.gap-system.org/lib?set?IsEqualSet
+dataconstructor http://www.gap-system.org/lib?set?AddSet
+dataconstructor http://www.gap-system.org/lib?set?UniteSet
+dataconstructor http://www.gap-system.org/lib?set?SubtractSet
+dataconstructor http://www.gap-system.org/lib?set?IsSubsetSet
 theory http://www.gap-system.org/lib?set
 HasMeta http://www.gap-system.org/lib?set http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?set http://www.gap-system.org/lib?object
diff --git a/relational/http..www.gap-system.org/lib/sgpres.rel b/relational/http..www.gap-system.org/lib/sgpres.rel
index 0dfcf5c3faa5724ec9a8641a814e8cc4f0479bdf..29e4f6888097615ac1606f063d2b8dabe6b0e6eb 100644
--- a/relational/http..www.gap-system.org/lib/sgpres.rel
+++ b/relational/http..www.gap-system.org/lib/sgpres.rel
@@ -20,6 +20,17 @@ implies http://www.gap-system.org/lib?sgpres?AugmentedCosetTableNormalClosure ht
 IsAttribute http://www.gap-system.org/lib?sgpres?AugmentedCosetTableNormalClosureInWholeGroup
 implies http://www.gap-system.org/lib?sgpres?AugmentedCosetTableNormalClosureInWholeGroup http://www.gap-system.org/lib?magma?IsMagmaWithInverses
 implies http://www.gap-system.org/lib?sgpres?AugmentedCosetTableNormalClosureInWholeGroup http://www.gap-system.org/lib?magma?IsAssociative
+dataconstructor http://www.gap-system.org/lib?sgpres?AugmentedCosetTableMtcInWholeGroup
+dataconstructor http://www.gap-system.org/lib?sgpres?IsPresentation
+dataconstructor http://www.gap-system.org/lib?sgpres?IsPresentation_st0
+dataconstructor http://www.gap-system.org/lib?sgpres?PrimaryGeneratorWords
+dataconstructor http://www.gap-system.org/lib?sgpres?CosetTableBySubgroup
+dataconstructor http://www.gap-system.org/lib?sgpres?IsPresentationDefaultRep
+dataconstructor http://www.gap-system.org/lib?sgpres?IsPresentationDefaultRep_st0
+dataconstructor http://www.gap-system.org/lib?sgpres?IsPresentationDefaultRep_st1
+dataconstructor http://www.gap-system.org/lib?sgpres?AugmentedCosetTableRrsInWholeGroup
+dataconstructor http://www.gap-system.org/lib?sgpres?AugmentedCosetTableNormalClosure
+dataconstructor http://www.gap-system.org/lib?sgpres?AugmentedCosetTableNormalClosureInWholeGroup
 theory http://www.gap-system.org/lib?sgpres
 HasMeta http://www.gap-system.org/lib?sgpres http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?sgpres http://www.gap-system.org/lib?magma
@@ -30,7 +41,6 @@ Declares http://www.gap-system.org/lib?sgpres http://www.gap-system.org/lib?sgpr
 constant http://www.gap-system.org/lib?sgpres?IsPresentation
 Declares http://www.gap-system.org/lib?sgpres http://www.gap-system.org/lib?sgpres?IsPresentation_st0
 constant http://www.gap-system.org/lib?sgpres?IsPresentation_st0
-Includes http://www.gap-system.org/lib?sgpres http://www.gap-system.org/lib?sgpres
 Declares http://www.gap-system.org/lib?sgpres http://www.gap-system.org/lib?sgpres?PrimaryGeneratorWords
 constant http://www.gap-system.org/lib?sgpres?PrimaryGeneratorWords
 Declares http://www.gap-system.org/lib?sgpres http://www.gap-system.org/lib?sgpres?CosetTableBySubgroup
diff --git a/relational/http..www.gap-system.org/lib/smgideal.rel b/relational/http..www.gap-system.org/lib/smgideal.rel
index 11d408600e7d8d3e7cf1b9ac052528aaadecba13..47e940dc0816752d9548ce09c21b4439a4061ad9 100644
--- a/relational/http..www.gap-system.org/lib/smgideal.rel
+++ b/relational/http..www.gap-system.org/lib/smgideal.rel
@@ -12,6 +12,10 @@ IsAttribute http://www.gap-system.org/lib?smgideal?ReesCongruenceOfSemigroupIdea
 implies http://www.gap-system.org/lib?smgideal?ReesCongruenceOfSemigroupIdeal http://www.gap-system.org/lib?extlset?IsLeftActedOnBySuperset
 implies http://www.gap-system.org/lib?smgideal?ReesCongruenceOfSemigroupIdeal http://www.gap-system.org/lib?extrset?IsRightActedOnBySuperset
 implies http://www.gap-system.org/lib?smgideal?ReesCongruenceOfSemigroupIdeal http://www.gap-system.org/lib?magma?IsMagma
+dataconstructor http://www.gap-system.org/lib?smgideal?IsRightSemigroupIdeal
+dataconstructor http://www.gap-system.org/lib?smgideal?IsSemigroupIdeal
+dataconstructor http://www.gap-system.org/lib?smgideal?IsLeftSemigroupIdeal
+dataconstructor http://www.gap-system.org/lib?smgideal?ReesCongruenceOfSemigroupIdeal
 theory http://www.gap-system.org/lib?smgideal
 HasMeta http://www.gap-system.org/lib?smgideal http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?smgideal http://www.gap-system.org/lib?extrset
diff --git a/relational/http..www.gap-system.org/lib/stbc.rel b/relational/http..www.gap-system.org/lib/stbc.rel
index 0b6a13fdbcee1dd3c366db98229382839d70ebda..dc9a13285f5082283939b5e51dda58d5bdd9a4a4 100644
--- a/relational/http..www.gap-system.org/lib/stbc.rel
+++ b/relational/http..www.gap-system.org/lib/stbc.rel
@@ -30,6 +30,23 @@ implies http://www.gap-system.org/lib?stbc?BaseOfGroup http://www.gap-system.org
 implies http://www.gap-system.org/lib?stbc?BaseOfGroup http://www.gap-system.org/lib?magma?IsMagmaWithInverses
 implies http://www.gap-system.org/lib?stbc?BaseOfGroup http://www.gap-system.org/lib?magma?IsAssociative
 IsAttribute http://www.gap-system.org/lib?stbc?StabChainImmutable
+dataconstructor http://www.gap-system.org/lib?stbc?StabChainOp
+dataconstructor http://www.gap-system.org/lib?stbc?MembershipTestKnownBase
+dataconstructor http://www.gap-system.org/lib?stbc?IsPermOnEnumerator
+dataconstructor http://www.gap-system.org/lib?stbc?IsPermOnEnumerator_st0
+dataconstructor http://www.gap-system.org/lib?stbc?IsPermOnEnumerator_st1
+dataconstructor http://www.gap-system.org/lib?stbc?IsPermOnEnumerator_st2
+dataconstructor http://www.gap-system.org/lib?stbc?IsPermOnEnumerator_st3
+dataconstructor http://www.gap-system.org/lib?stbc?IsPermOnEnumerator_st4
+dataconstructor http://www.gap-system.org/lib?stbc?IsPermOnEnumerator_st5
+dataconstructor http://www.gap-system.org/lib?stbc?IsPermOnEnumerator_st6
+dataconstructor http://www.gap-system.org/lib?stbc?IsPermOnEnumerator_st7
+dataconstructor http://www.gap-system.org/lib?stbc?StabChainMutable
+dataconstructor http://www.gap-system.org/lib?stbc?StabChainOptions
+dataconstructor http://www.gap-system.org/lib?stbc?MinimalStabChain
+dataconstructor http://www.gap-system.org/lib?stbc?PermOnEnumerator
+dataconstructor http://www.gap-system.org/lib?stbc?BaseOfGroup
+dataconstructor http://www.gap-system.org/lib?stbc?StabChainImmutable
 theory http://www.gap-system.org/lib?stbc
 HasMeta http://www.gap-system.org/lib?stbc http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?stbc http://www.gap-system.org/lib?magma
diff --git a/relational/http..www.gap-system.org/lib/stbcbckt.rel b/relational/http..www.gap-system.org/lib/stbcbckt.rel
index e7e53783fca1ab4b1e63fad46d1f435c42e771d1..ce6410afd8bd6e51524c9301797408341410fe0e 100644
--- a/relational/http..www.gap-system.org/lib/stbcbckt.rel
+++ b/relational/http..www.gap-system.org/lib/stbcbckt.rel
@@ -20,6 +20,25 @@ IsAttribute http://www.gap-system.org/lib?stbcbckt?TwoClosure
 implies http://www.gap-system.org/lib?stbcbckt?TwoClosure http://www.gap-system.org/lib?permutat?IsPerm
 implies http://www.gap-system.org/lib?stbcbckt?TwoClosure http://www.gap-system.org/lib?magma?IsMagmaWithInverses
 implies http://www.gap-system.org/lib?stbcbckt?TwoClosure http://www.gap-system.org/lib?magma?IsAssociative
+dataconstructor http://www.gap-system.org/lib?stbcbckt?IsSlicedPermInv
+dataconstructor http://www.gap-system.org/lib?stbcbckt?IsSlicedPermInv_st0
+dataconstructor http://www.gap-system.org/lib?stbcbckt?IsSlicedPermInv_st1
+dataconstructor http://www.gap-system.org/lib?stbcbckt?IsSlicedPermInv_st2
+dataconstructor http://www.gap-system.org/lib?stbcbckt?IsSlicedPermInv_st3
+dataconstructor http://www.gap-system.org/lib?stbcbckt?IsSlicedPermInv_st4
+dataconstructor http://www.gap-system.org/lib?stbcbckt?IsSlicedPermInv_st5
+dataconstructor http://www.gap-system.org/lib?stbcbckt?IsSlicedPermInv_st6
+dataconstructor http://www.gap-system.org/lib?stbcbckt?IsSlicedPermInv_st7
+dataconstructor http://www.gap-system.org/lib?stbcbckt?IsSlicedPerm
+dataconstructor http://www.gap-system.org/lib?stbcbckt?IsSlicedPerm_st0
+dataconstructor http://www.gap-system.org/lib?stbcbckt?IsSlicedPerm_st1
+dataconstructor http://www.gap-system.org/lib?stbcbckt?IsSlicedPerm_st2
+dataconstructor http://www.gap-system.org/lib?stbcbckt?IsSlicedPerm_st3
+dataconstructor http://www.gap-system.org/lib?stbcbckt?IsSlicedPerm_st4
+dataconstructor http://www.gap-system.org/lib?stbcbckt?IsSlicedPerm_st5
+dataconstructor http://www.gap-system.org/lib?stbcbckt?IsSlicedPerm_st6
+dataconstructor http://www.gap-system.org/lib?stbcbckt?IsSlicedPerm_st7
+dataconstructor http://www.gap-system.org/lib?stbcbckt?TwoClosure
 theory http://www.gap-system.org/lib?stbcbckt
 HasMeta http://www.gap-system.org/lib?stbcbckt http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?stbcbckt http://www.gap-system.org/lib?permutat
diff --git a/relational/http..www.gap-system.org/lib/straight.rel b/relational/http..www.gap-system.org/lib/straight.rel
index d1f33a24ffe6c752a95bc63a44a5b9d57597310d..b09c3cb4597a26f55d621c04a0beaac0a715e9e9 100644
--- a/relational/http..www.gap-system.org/lib/straight.rel
+++ b/relational/http..www.gap-system.org/lib/straight.rel
@@ -23,11 +23,27 @@ IsAttribute http://www.gap-system.org/lib?straight?StretchImportantSLPElement
 implies http://www.gap-system.org/lib?straight?StretchImportantSLPElement http://www.gap-system.org/lib?arith?IsMultiplicativeElementWithInverse
 IsAttribute http://www.gap-system.org/lib?straight?SlotUsagePattern
 implies http://www.gap-system.org/lib?straight?SlotUsagePattern http://www.gap-system.org/lib?straight?IsStraightLineProgram
+dataconstructor http://www.gap-system.org/lib?straight?IsStraightLineProgram
+dataconstructor http://www.gap-system.org/lib?straight?LinesOfStraightLineProgram
+dataconstructor http://www.gap-system.org/lib?straight?LargestNrSlots
+dataconstructor http://www.gap-system.org/lib?straight?StraightLineProgramElmRankFilter
+dataconstructor http://www.gap-system.org/lib?straight?NrInputsOfStraightLineProgram
+dataconstructor http://www.gap-system.org/lib?straight?StraightLineProgElmType
+dataconstructor http://www.gap-system.org/lib?straight?IsStraightLineProgElm
+dataconstructor http://www.gap-system.org/lib?straight?IsStraightLineProgElm_st0
+dataconstructor http://www.gap-system.org/lib?straight?IsStraightLineProgElm_st1
+dataconstructor http://www.gap-system.org/lib?straight?IsStraightLineProgElm_st2
+dataconstructor http://www.gap-system.org/lib?straight?IsStraightLineProgElm_st3
+dataconstructor http://www.gap-system.org/lib?straight?IsStraightLineProgElm_st4
+dataconstructor http://www.gap-system.org/lib?straight?IsStraightLineProgElm_st5
+dataconstructor http://www.gap-system.org/lib?straight?IsStraightLineProgElm_st6
+dataconstructor http://www.gap-system.org/lib?straight?ResultOfStraightLineProgram
+dataconstructor http://www.gap-system.org/lib?straight?StretchImportantSLPElement
+dataconstructor http://www.gap-system.org/lib?straight?SlotUsagePattern
 theory http://www.gap-system.org/lib?straight
 HasMeta http://www.gap-system.org/lib?straight http://www.gap-system.org/?Types
 Declares http://www.gap-system.org/lib?straight http://www.gap-system.org/lib?straight?IsStraightLineProgram
 constant http://www.gap-system.org/lib?straight?IsStraightLineProgram
-Includes http://www.gap-system.org/lib?straight http://www.gap-system.org/lib?straight
 Declares http://www.gap-system.org/lib?straight http://www.gap-system.org/lib?straight?LinesOfStraightLineProgram
 constant http://www.gap-system.org/lib?straight?LinesOfStraightLineProgram
 Declares http://www.gap-system.org/lib?straight http://www.gap-system.org/lib?straight?LargestNrSlots
diff --git a/relational/http..www.gap-system.org/lib/streams.rel b/relational/http..www.gap-system.org/lib/streams.rel
index 89ff8d389e4a641d7bc340af6ea631452de16a6f..0238511b8df6ad2530d20251e058b728fef32fd5 100644
--- a/relational/http..www.gap-system.org/lib/streams.rel
+++ b/relational/http..www.gap-system.org/lib/streams.rel
@@ -87,11 +87,69 @@ IsAttribute http://www.gap-system.org/lib?streams?ReadLine
 implies http://www.gap-system.org/lib?streams?ReadLine http://www.gap-system.org/lib?streams?IsInputStream
 IsFilter http://www.gap-system.org/lib?streams?IsInputTextStringRep
 implies http://www.gap-system.org/lib?streams?IsInputTextStringRep_st0 http://www.gap-system.org/lib?type?IsPositionalObjectRep
+dataconstructor http://www.gap-system.org/lib?streams?IsStream
+dataconstructor http://www.gap-system.org/lib?streams?IsOutputStream
+dataconstructor http://www.gap-system.org/lib?streams?IsOutputStream_st0
+dataconstructor http://www.gap-system.org/lib?streams?IsOutputTextStream
+dataconstructor http://www.gap-system.org/lib?streams?IsOutputTextStream_st0
+dataconstructor http://www.gap-system.org/lib?streams?IsOutputTextStream_st1
+dataconstructor http://www.gap-system.org/lib?streams?IsOutputTextNone
+dataconstructor http://www.gap-system.org/lib?streams?IsOutputTextNone_st0
+dataconstructor http://www.gap-system.org/lib?streams?IsOutputTextNone_st1
+dataconstructor http://www.gap-system.org/lib?streams?IsOutputTextNone_st2
+dataconstructor http://www.gap-system.org/lib?streams?IsInputStream
+dataconstructor http://www.gap-system.org/lib?streams?IsInputStream_st0
+dataconstructor http://www.gap-system.org/lib?streams?PositionStream
+dataconstructor http://www.gap-system.org/lib?streams?IsInputOutputStreamByPtyRep
+dataconstructor http://www.gap-system.org/lib?streams?IsInputOutputStreamByPtyRep_st0
+dataconstructor http://www.gap-system.org/lib?streams?ReadAllLine
+dataconstructor http://www.gap-system.org/lib?streams?IsInputOutputStream
+dataconstructor http://www.gap-system.org/lib?streams?IsInputOutputStream_st0
+dataconstructor http://www.gap-system.org/lib?streams?IsInputOutputStream_st1
+dataconstructor http://www.gap-system.org/lib?streams?IsInputOutputStream_st2
+dataconstructor http://www.gap-system.org/lib?streams?PrintFormattingStatus
+dataconstructor http://www.gap-system.org/lib?streams?WriteLine
+dataconstructor http://www.gap-system.org/lib?streams?InputTextString
+dataconstructor http://www.gap-system.org/lib?streams?SeekPositionStream
+dataconstructor http://www.gap-system.org/lib?streams?IsInputTextStream
+dataconstructor http://www.gap-system.org/lib?streams?IsInputTextStream_st0
+dataconstructor http://www.gap-system.org/lib?streams?IsInputTextStream_st1
+dataconstructor http://www.gap-system.org/lib?streams?IsOutputTextStringRep
+dataconstructor http://www.gap-system.org/lib?streams?IsOutputTextStringRep_st0
+dataconstructor http://www.gap-system.org/lib?streams?IsClosedStream
+dataconstructor http://www.gap-system.org/lib?streams?IsInputTextNoneRep
+dataconstructor http://www.gap-system.org/lib?streams?IsInputTextNoneRep_st0
+dataconstructor http://www.gap-system.org/lib?streams?InputTextFile
+dataconstructor http://www.gap-system.org/lib?streams?IsEndOfStream
+dataconstructor http://www.gap-system.org/lib?streams?OutputTextFile
+dataconstructor http://www.gap-system.org/lib?streams?WriteByte
+dataconstructor http://www.gap-system.org/lib?streams?ReadByte
+dataconstructor http://www.gap-system.org/lib?streams?CloseStream
+dataconstructor http://www.gap-system.org/lib?streams?IsOutputTextNoneRep
+dataconstructor http://www.gap-system.org/lib?streams?IsOutputTextNoneRep_st0
+dataconstructor http://www.gap-system.org/lib?streams?IsInputTextFileRep
+dataconstructor http://www.gap-system.org/lib?streams?IsInputTextFileRep_st0
+dataconstructor http://www.gap-system.org/lib?streams?LogTo
+dataconstructor http://www.gap-system.org/lib?streams?InputLogTo
+dataconstructor http://www.gap-system.org/lib?streams?RewindStream
+dataconstructor http://www.gap-system.org/lib?streams?ReadAll
+dataconstructor http://www.gap-system.org/lib?streams?FileDescriptorOfStream
+dataconstructor http://www.gap-system.org/lib?streams?OutputTextString
+dataconstructor http://www.gap-system.org/lib?streams?IsOutputTextFileRep
+dataconstructor http://www.gap-system.org/lib?streams?IsOutputTextFileRep_st0
+dataconstructor http://www.gap-system.org/lib?streams?WriteAll
+dataconstructor http://www.gap-system.org/lib?streams?OutputLogTo
+dataconstructor http://www.gap-system.org/lib?streams?IsInputTextNone
+dataconstructor http://www.gap-system.org/lib?streams?IsInputTextNone_st0
+dataconstructor http://www.gap-system.org/lib?streams?IsInputTextNone_st1
+dataconstructor http://www.gap-system.org/lib?streams?IsInputTextNone_st2
+dataconstructor http://www.gap-system.org/lib?streams?ReadLine
+dataconstructor http://www.gap-system.org/lib?streams?IsInputTextStringRep
+dataconstructor http://www.gap-system.org/lib?streams?IsInputTextStringRep_st0
 theory http://www.gap-system.org/lib?streams
 HasMeta http://www.gap-system.org/lib?streams http://www.gap-system.org/?Types
 Declares http://www.gap-system.org/lib?streams http://www.gap-system.org/lib?streams?IsStream
 constant http://www.gap-system.org/lib?streams?IsStream
-Includes http://www.gap-system.org/lib?streams http://www.gap-system.org/lib?streams
 Declares http://www.gap-system.org/lib?streams http://www.gap-system.org/lib?streams?IsOutputStream
 constant http://www.gap-system.org/lib?streams?IsOutputStream
 Declares http://www.gap-system.org/lib?streams http://www.gap-system.org/lib?streams?IsOutputStream_st0
diff --git a/relational/http..www.gap-system.org/lib/string.rel b/relational/http..www.gap-system.org/lib/string.rel
index 3ead1c628d3937c6d8ffb9cf12e1b434832974b1..18f2be96296d07be2ae4fbb8ca3f86e311b3d95f 100644
--- a/relational/http..www.gap-system.org/lib/string.rel
+++ b/relational/http..www.gap-system.org/lib/string.rel
@@ -8,6 +8,15 @@ implies http://www.gap-system.org/lib?string?IsStringRep_st0 http://www.gap-syst
 IsAttribute http://www.gap-system.org/lib?string?SplitString
 implies http://www.gap-system.org/lib?string?SplitString http://www.gap-system.org/lib?string?IsString
 IsFilter http://www.gap-system.org/lib?string?IsChar
+dataconstructor http://www.gap-system.org/lib?string?IsString
+dataconstructor http://www.gap-system.org/lib?string?IsString_st0
+dataconstructor http://www.gap-system.org/lib?string?IsString_st1
+dataconstructor http://www.gap-system.org/lib?string?IsString_st2
+dataconstructor http://www.gap-system.org/lib?string?IsString_st3
+dataconstructor http://www.gap-system.org/lib?string?IsStringRep
+dataconstructor http://www.gap-system.org/lib?string?IsStringRep_st0
+dataconstructor http://www.gap-system.org/lib?string?SplitString
+dataconstructor http://www.gap-system.org/lib?string?IsChar
 theory http://www.gap-system.org/lib?string
 HasMeta http://www.gap-system.org/lib?string http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?string http://www.gap-system.org/lib?list
@@ -27,7 +36,6 @@ Declares http://www.gap-system.org/lib?string http://www.gap-system.org/lib?stri
 constant http://www.gap-system.org/lib?string?IsStringRep
 Declares http://www.gap-system.org/lib?string http://www.gap-system.org/lib?string?IsStringRep_st0
 constant http://www.gap-system.org/lib?string?IsStringRep_st0
-Includes http://www.gap-system.org/lib?string http://www.gap-system.org/lib?string
 Declares http://www.gap-system.org/lib?string http://www.gap-system.org/lib?string?SplitString
 constant http://www.gap-system.org/lib?string?SplitString
 Declares http://www.gap-system.org/lib?string http://www.gap-system.org/lib?string?IsChar
diff --git a/relational/http..www.gap-system.org/lib/tcsemi.rel b/relational/http..www.gap-system.org/lib/tcsemi.rel
index 5b2a32d7e9c877c910065a318fda717a8073b181..a8c408c8b2797fa5da5545603283e7a3f9c5ed38 100644
--- a/relational/http..www.gap-system.org/lib/tcsemi.rel
+++ b/relational/http..www.gap-system.org/lib/tcsemi.rel
@@ -1,5 +1,6 @@
 IsAttribute http://www.gap-system.org/lib?tcsemi?CosetTableOfFpSemigroup
 implies http://www.gap-system.org/lib?tcsemi?CosetTableOfFpSemigroup http://www.gap-system.org/lib?mgmcong?IsRightMagmaCongruence
+dataconstructor http://www.gap-system.org/lib?tcsemi?CosetTableOfFpSemigroup
 theory http://www.gap-system.org/lib?tcsemi
 HasMeta http://www.gap-system.org/lib?tcsemi http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?tcsemi http://www.gap-system.org/lib?mgmcong
diff --git a/relational/http..www.gap-system.org/lib/tietze.rel b/relational/http..www.gap-system.org/lib/tietze.rel
index 69886ad077446b988482db1a5f9417393728fd2d..5806b4109dbb71ceb260a32c1ea71ab26fc5ef2a 100644
--- a/relational/http..www.gap-system.org/lib/tietze.rel
+++ b/relational/http..www.gap-system.org/lib/tietze.rel
@@ -2,6 +2,8 @@ IsAttribute http://www.gap-system.org/lib?tietze?TzOptions
 implies http://www.gap-system.org/lib?tietze?TzOptions http://www.gap-system.org/lib?sgpres?IsPresentation
 IsAttribute http://www.gap-system.org/lib?tietze?TietzeOrigin
 implies http://www.gap-system.org/lib?tietze?TietzeOrigin http://www.gap-system.org/lib?grpfp?IsSubgroupFpGroup
+dataconstructor http://www.gap-system.org/lib?tietze?TzOptions
+dataconstructor http://www.gap-system.org/lib?tietze?TietzeOrigin
 theory http://www.gap-system.org/lib?tietze
 HasMeta http://www.gap-system.org/lib?tietze http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?tietze http://www.gap-system.org/lib?sgpres
diff --git a/relational/http..www.gap-system.org/lib/tom.rel b/relational/http..www.gap-system.org/lib/tom.rel
index 65b620356575e334633de0df748bd062dd4fbab9..16326da6b9757c772cd0e210d41426ee1dadf19f 100644
--- a/relational/http..www.gap-system.org/lib/tom.rel
+++ b/relational/http..www.gap-system.org/lib/tom.rel
@@ -153,11 +153,60 @@ IsAttribute http://www.gap-system.org/lib?tom?FactorGroupTom
 implies http://www.gap-system.org/lib?tom?FactorGroupTom http://www.gap-system.org/lib?tom?IsTableOfMarks
 implies http://www.gap-system.org/lib?tom?FactorGroupTom http://www.gap-system.org/lib?cyclotom?IsInt
 implies http://www.gap-system.org/lib?tom?FactorGroupTom http://www.gap-system.org/lib?cyclotom?IsPosRat
+dataconstructor http://www.gap-system.org/lib?tom?IsTableOfMarks
+dataconstructor http://www.gap-system.org/lib?tom?ContainingTom
+dataconstructor http://www.gap-system.org/lib?tom?FusionCharTableTom
+dataconstructor http://www.gap-system.org/lib?tom?CyclicExtensionsTomOp
+dataconstructor http://www.gap-system.org/lib?tom?DerivedSubgroupTom
+dataconstructor http://www.gap-system.org/lib?tom?MarksTom
+dataconstructor http://www.gap-system.org/lib?tom?NormalizersTom
+dataconstructor http://www.gap-system.org/lib?tom?LengthsTom
+dataconstructor http://www.gap-system.org/lib?tom?StraightLineProgramsTom
+dataconstructor http://www.gap-system.org/lib?tom?RepresentativeTomByGeneratorsNC
+dataconstructor http://www.gap-system.org/lib?tom?PermCharsTom
+dataconstructor http://www.gap-system.org/lib?tom?DecomposedFixedPointVector
+dataconstructor http://www.gap-system.org/lib?tom?MaximalSubgroupsTom
+dataconstructor http://www.gap-system.org/lib?tom?IdempotentsTomInfo
+dataconstructor http://www.gap-system.org/lib?tom?RepresentativeTom
+dataconstructor http://www.gap-system.org/lib?tom?TableOfMarks
+dataconstructor http://www.gap-system.org/lib?tom?IsAbelianTom
+dataconstructor http://www.gap-system.org/lib?tom?IsPerfectTom
+dataconstructor http://www.gap-system.org/lib?tom?ComputedCyclicExtensionsTom
+dataconstructor http://www.gap-system.org/lib?tom?IsSolvableTom
+dataconstructor http://www.gap-system.org/lib?tom?NrSubsTom
+dataconstructor http://www.gap-system.org/lib?tom?IsTableOfMarksWithGens
+dataconstructor http://www.gap-system.org/lib?tom?IntersectionsTom
+dataconstructor http://www.gap-system.org/lib?tom?ContainedTom
+dataconstructor http://www.gap-system.org/lib?tom?ClassTypesTom
+dataconstructor http://www.gap-system.org/lib?tom?OrdersTom
+dataconstructor http://www.gap-system.org/lib?tom?WeightsTom
+dataconstructor http://www.gap-system.org/lib?tom?SortedTom
+dataconstructor http://www.gap-system.org/lib?tom?ClassNamesTom
+dataconstructor http://www.gap-system.org/lib?tom?MinimalSupergroupsTom
+dataconstructor http://www.gap-system.org/lib?tom?DerivedSubgroupsTomUnique
+dataconstructor http://www.gap-system.org/lib?tom?TableOfMarksDihedral
+dataconstructor http://www.gap-system.org/lib?tom?CyclicExtensionsTom
+dataconstructor http://www.gap-system.org/lib?tom?PermutationTom
+dataconstructor http://www.gap-system.org/lib?tom?RepresentativeTomByGenerators
+dataconstructor http://www.gap-system.org/lib?tom?IsNilpotentTom
+dataconstructor http://www.gap-system.org/lib?tom?MatTom
+dataconstructor http://www.gap-system.org/lib?tom?SubsTom
+dataconstructor http://www.gap-system.org/lib?tom?DerivedSubgroupsTomPossible
+dataconstructor http://www.gap-system.org/lib?tom?MoebiusTom
+dataconstructor http://www.gap-system.org/lib?tom?NormalizerTom
+dataconstructor http://www.gap-system.org/lib?tom?EulerianFunctionByTom
+dataconstructor http://www.gap-system.org/lib?tom?TableOfMarksCyclic
+dataconstructor http://www.gap-system.org/lib?tom?FusionsTom
+dataconstructor http://www.gap-system.org/lib?tom?IsCyclicTom
+dataconstructor http://www.gap-system.org/lib?tom?GeneratorsSubgroupsTom
+dataconstructor http://www.gap-system.org/lib?tom?TableOfMarksFrobenius
+dataconstructor http://www.gap-system.org/lib?tom?PossibleFusionsCharTableTom
+dataconstructor http://www.gap-system.org/lib?tom?IdempotentsTom
+dataconstructor http://www.gap-system.org/lib?tom?FactorGroupTom
 theory http://www.gap-system.org/lib?tom
 HasMeta http://www.gap-system.org/lib?tom http://www.gap-system.org/?Types
 Declares http://www.gap-system.org/lib?tom http://www.gap-system.org/lib?tom?IsTableOfMarks
 constant http://www.gap-system.org/lib?tom?IsTableOfMarks
-Includes http://www.gap-system.org/lib?tom http://www.gap-system.org/lib?tom
 Includes http://www.gap-system.org/lib?tom http://www.gap-system.org/lib?cyclotom
 Declares http://www.gap-system.org/lib?tom http://www.gap-system.org/lib?tom?ContainingTom
 constant http://www.gap-system.org/lib?tom?ContainingTom
diff --git a/relational/http..www.gap-system.org/lib/trans.rel b/relational/http..www.gap-system.org/lib/trans.rel
index fd0dd7f1ce6b8d9fe23ba67c586bc04045a7c5d6..0315d75b9d852d883a32b39c1f638fc8844575ff 100644
--- a/relational/http..www.gap-system.org/lib/trans.rel
+++ b/relational/http..www.gap-system.org/lib/trans.rel
@@ -120,6 +120,53 @@ implies http://www.gap-system.org/lib?trans?RankOfTransformation http://www.gap-
 implies http://www.gap-system.org/lib?trans?RankOfTransformation http://www.gap-system.org/lib?cyclotom?IsPosRat
 implies http://www.gap-system.org/lib?trans?RankOfTransformation http://www.gap-system.org/lib?cyclotom?IsZeroCyc
 implies http://www.gap-system.org/lib?trans?RankOfTransformation http://www.gap-system.org/lib?list?IsList
+dataconstructor http://www.gap-system.org/lib?trans?TransformationOp
+dataconstructor http://www.gap-system.org/lib?trans?RandomTransformation
+dataconstructor http://www.gap-system.org/lib?trans?IsTransformation
+dataconstructor http://www.gap-system.org/lib?trans?IsTransformation_st0
+dataconstructor http://www.gap-system.org/lib?trans?IsTransformation_st1
+dataconstructor http://www.gap-system.org/lib?trans?IsTransformation_st2
+dataconstructor http://www.gap-system.org/lib?trans?IsTransformation_st3
+dataconstructor http://www.gap-system.org/lib?trans?IsTransformation_st4
+dataconstructor http://www.gap-system.org/lib?trans?IsTransformation_st5
+dataconstructor http://www.gap-system.org/lib?trans?OnKernelAntiAction
+dataconstructor http://www.gap-system.org/lib?trans?Idempotent
+dataconstructor http://www.gap-system.org/lib?trans?Transformation
+dataconstructor http://www.gap-system.org/lib?trans?SmallestImageOfMovedPoint
+dataconstructor http://www.gap-system.org/lib?trans?IsTrans4Rep
+dataconstructor http://www.gap-system.org/lib?trans?IsTrans4Rep_st0
+dataconstructor http://www.gap-system.org/lib?trans?AsPermutation
+dataconstructor http://www.gap-system.org/lib?trans?ComponentsOfTransformation
+dataconstructor http://www.gap-system.org/lib?trans?ConstantTransformation
+dataconstructor http://www.gap-system.org/lib?trans?NrComponentsOfTransformation
+dataconstructor http://www.gap-system.org/lib?trans?CycleTransformationInt
+dataconstructor http://www.gap-system.org/lib?trans?TransformationByImageAndKernel
+dataconstructor http://www.gap-system.org/lib?trans?IsTrans2Rep
+dataconstructor http://www.gap-system.org/lib?trans?IsTrans2Rep_st0
+dataconstructor http://www.gap-system.org/lib?trans?KernelOfTransformation
+dataconstructor http://www.gap-system.org/lib?trans?SmallestIdempotentPower
+dataconstructor http://www.gap-system.org/lib?trans?TransformationOpNC
+dataconstructor http://www.gap-system.org/lib?trans?NumberTransformation
+dataconstructor http://www.gap-system.org/lib?trans?ImageListOfTransformation
+dataconstructor http://www.gap-system.org/lib?trans?TransformationNumber
+dataconstructor http://www.gap-system.org/lib?trans?TransformationList
+dataconstructor http://www.gap-system.org/lib?trans?ImageSetOfTransformation
+dataconstructor http://www.gap-system.org/lib?trans?TrimTransformation
+dataconstructor http://www.gap-system.org/lib?trans?ComponentTransformationInt
+dataconstructor http://www.gap-system.org/lib?trans?RightOne
+dataconstructor http://www.gap-system.org/lib?trans?LeftOne
+dataconstructor http://www.gap-system.org/lib?trans?FlatKernelOfTransformation
+dataconstructor http://www.gap-system.org/lib?trans?AsTransformation
+dataconstructor http://www.gap-system.org/lib?trans?CyclesOfTransformation
+dataconstructor http://www.gap-system.org/lib?trans?PreImagesOfTransformation
+dataconstructor http://www.gap-system.org/lib?trans?AsBinaryRelation
+dataconstructor http://www.gap-system.org/lib?trans?TransformationListList
+dataconstructor http://www.gap-system.org/lib?trans?IsFlatKernelOfTransformation
+dataconstructor http://www.gap-system.org/lib?trans?ComponentRepsOfTransformation
+dataconstructor http://www.gap-system.org/lib?trans?LargestImageOfMovedPoint
+dataconstructor http://www.gap-system.org/lib?trans?DegreeOfTransformationCollection
+dataconstructor http://www.gap-system.org/lib?trans?PermLeftQuoTransformation
+dataconstructor http://www.gap-system.org/lib?trans?RankOfTransformation
 theory http://www.gap-system.org/lib?trans
 HasMeta http://www.gap-system.org/lib?trans http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?trans http://www.gap-system.org/lib?list
@@ -146,7 +193,6 @@ Declares http://www.gap-system.org/lib?trans http://www.gap-system.org/lib?trans
 constant http://www.gap-system.org/lib?trans?IsTransformation_st4
 Declares http://www.gap-system.org/lib?trans http://www.gap-system.org/lib?trans?IsTransformation_st5
 constant http://www.gap-system.org/lib?trans?IsTransformation_st5
-Includes http://www.gap-system.org/lib?trans http://www.gap-system.org/lib?trans
 Declares http://www.gap-system.org/lib?trans http://www.gap-system.org/lib?trans?OnKernelAntiAction
 constant http://www.gap-system.org/lib?trans?OnKernelAntiAction
 Declares http://www.gap-system.org/lib?trans http://www.gap-system.org/lib?trans?Idempotent
diff --git a/relational/http..www.gap-system.org/lib/tuples.rel b/relational/http..www.gap-system.org/lib/tuples.rel
index d92ce6c1e8a6a91ee47e1e13f25455711359e6d8..bb7961e310afbd5361646c809ea87b2d34412141 100644
--- a/relational/http..www.gap-system.org/lib/tuples.rel
+++ b/relational/http..www.gap-system.org/lib/tuples.rel
@@ -39,6 +39,42 @@ implies http://www.gap-system.org/lib?tuples?IsDefaultDirectProductElementRep_st
 implies http://www.gap-system.org/lib?tuples?IsDefaultDirectProductElementRep_st15 http://www.gap-system.org/lib?arith?IsMultiplicativeElementWithOne
 implies http://www.gap-system.org/lib?tuples?IsDefaultDirectProductElementRep_st15 http://www.gap-system.org/lib?arith?IsMultiplicativeElementWithInverse
 implies http://www.gap-system.org/lib?tuples?IsDefaultDirectProductElementRep_st15 http://www.gap-system.org/lib?tuples?IsDirectProductElement
+dataconstructor http://www.gap-system.org/lib?tuples?DirectProductElementsFamily
+dataconstructor http://www.gap-system.org/lib?tuples?DirectProductElement
+dataconstructor http://www.gap-system.org/lib?tuples?IsDirectProductElement
+dataconstructor http://www.gap-system.org/lib?tuples?IsDirectProductElement_st0
+dataconstructor http://www.gap-system.org/lib?tuples?IsDirectProductElement_st1
+dataconstructor http://www.gap-system.org/lib?tuples?IsDirectProductElement_st2
+dataconstructor http://www.gap-system.org/lib?tuples?IsDirectProductElement_st3
+dataconstructor http://www.gap-system.org/lib?tuples?IsDirectProductElement_st4
+dataconstructor http://www.gap-system.org/lib?tuples?IsDirectProductElement_st5
+dataconstructor http://www.gap-system.org/lib?tuples?IsDirectProductElement_st6
+dataconstructor http://www.gap-system.org/lib?tuples?IsDirectProductElement_st7
+dataconstructor http://www.gap-system.org/lib?tuples?IsDirectProductElement_st8
+dataconstructor http://www.gap-system.org/lib?tuples?IsDirectProductElement_st9
+dataconstructor http://www.gap-system.org/lib?tuples?IsDirectProductElement_st10
+dataconstructor http://www.gap-system.org/lib?tuples?IsDirectProductElement_st11
+dataconstructor http://www.gap-system.org/lib?tuples?IsDirectProductElement_st12
+dataconstructor http://www.gap-system.org/lib?tuples?IsDirectProductElement_st13
+dataconstructor http://www.gap-system.org/lib?tuples?ComponentsOfDirectProductElementsFamily
+dataconstructor http://www.gap-system.org/lib?tuples?DirectProductElementNC
+dataconstructor http://www.gap-system.org/lib?tuples?IsDefaultDirectProductElementRep
+dataconstructor http://www.gap-system.org/lib?tuples?IsDefaultDirectProductElementRep_st0
+dataconstructor http://www.gap-system.org/lib?tuples?IsDefaultDirectProductElementRep_st1
+dataconstructor http://www.gap-system.org/lib?tuples?IsDefaultDirectProductElementRep_st2
+dataconstructor http://www.gap-system.org/lib?tuples?IsDefaultDirectProductElementRep_st3
+dataconstructor http://www.gap-system.org/lib?tuples?IsDefaultDirectProductElementRep_st4
+dataconstructor http://www.gap-system.org/lib?tuples?IsDefaultDirectProductElementRep_st5
+dataconstructor http://www.gap-system.org/lib?tuples?IsDefaultDirectProductElementRep_st6
+dataconstructor http://www.gap-system.org/lib?tuples?IsDefaultDirectProductElementRep_st7
+dataconstructor http://www.gap-system.org/lib?tuples?IsDefaultDirectProductElementRep_st8
+dataconstructor http://www.gap-system.org/lib?tuples?IsDefaultDirectProductElementRep_st9
+dataconstructor http://www.gap-system.org/lib?tuples?IsDefaultDirectProductElementRep_st10
+dataconstructor http://www.gap-system.org/lib?tuples?IsDefaultDirectProductElementRep_st11
+dataconstructor http://www.gap-system.org/lib?tuples?IsDefaultDirectProductElementRep_st12
+dataconstructor http://www.gap-system.org/lib?tuples?IsDefaultDirectProductElementRep_st13
+dataconstructor http://www.gap-system.org/lib?tuples?IsDefaultDirectProductElementRep_st14
+dataconstructor http://www.gap-system.org/lib?tuples?IsDefaultDirectProductElementRep_st15
 theory http://www.gap-system.org/lib?tuples
 HasMeta http://www.gap-system.org/lib?tuples http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?tuples http://www.gap-system.org/lib?coll
@@ -79,7 +115,6 @@ Declares http://www.gap-system.org/lib?tuples http://www.gap-system.org/lib?tupl
 constant http://www.gap-system.org/lib?tuples?IsDirectProductElement_st12
 Declares http://www.gap-system.org/lib?tuples http://www.gap-system.org/lib?tuples?IsDirectProductElement_st13
 constant http://www.gap-system.org/lib?tuples?IsDirectProductElement_st13
-Includes http://www.gap-system.org/lib?tuples http://www.gap-system.org/lib?tuples
 Declares http://www.gap-system.org/lib?tuples http://www.gap-system.org/lib?tuples?ComponentsOfDirectProductElementsFamily
 constant http://www.gap-system.org/lib?tuples?ComponentsOfDirectProductElementsFamily
 Declares http://www.gap-system.org/lib?tuples http://www.gap-system.org/lib?tuples?DirectProductElementNC
diff --git a/relational/http..www.gap-system.org/lib/twocohom.rel b/relational/http..www.gap-system.org/lib/twocohom.rel
index 0a83b9152b7280ef5914581a5b5a5b01e6be568c..71a5c6c5783b46e501238c35740de304d76549fd 100644
--- a/relational/http..www.gap-system.org/lib/twocohom.rel
+++ b/relational/http..www.gap-system.org/lib/twocohom.rel
@@ -10,6 +10,9 @@ IsAttribute http://www.gap-system.org/lib?twocohom?TwoCocycles
 implies http://www.gap-system.org/lib?twocohom?TwoCocycles http://www.gap-system.org/lib?magma?IsMagmaWithInverses
 implies http://www.gap-system.org/lib?twocohom?TwoCocycles http://www.gap-system.org/lib?magma?IsAssociative
 implies http://www.gap-system.org/lib?twocohom?TwoCocycles http://www.gap-system.org/lib?rwspcgrp?IsMultiplicativeElementWithInverseByPolycyclicCollector
+dataconstructor http://www.gap-system.org/lib?twocohom?TwoCoboundaries
+dataconstructor http://www.gap-system.org/lib?twocohom?TwoCohomology
+dataconstructor http://www.gap-system.org/lib?twocohom?TwoCocycles
 theory http://www.gap-system.org/lib?twocohom
 HasMeta http://www.gap-system.org/lib?twocohom http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?twocohom http://www.gap-system.org/lib?magma
diff --git a/relational/http..www.gap-system.org/lib/type.rel b/relational/http..www.gap-system.org/lib/type.rel
index 9b492e9965f827175533067e4fb416dc858f77a1..5accf1239a9644ef121750e5171af761da92e50c 100644
--- a/relational/http..www.gap-system.org/lib/type.rel
+++ b/relational/http..www.gap-system.org/lib/type.rel
@@ -20,13 +20,34 @@ IsFilter http://www.gap-system.org/lib?type?IsReadOnlyPositionalObjectRep
 implies http://www.gap-system.org/lib?type?IsReadOnlyPositionalObjectRep_st0 http://www.gap-system.org/lib?type?IsPositionalObjectRep
 IsFilter http://www.gap-system.org/lib?type?IsAtomicPositionalObjectRep
 implies http://www.gap-system.org/lib?type?IsAtomicPositionalObjectRep_st0 http://www.gap-system.org/lib?type?IsPositionalObjectRep
+dataconstructor http://www.gap-system.org/lib?type?IsFamily
+dataconstructor http://www.gap-system.org/lib?type?IsComponentObjectRep
+dataconstructor http://www.gap-system.org/lib?type?IsAttributeStoringRep
+dataconstructor http://www.gap-system.org/lib?type?IsAttributeStoringRep_st0
+dataconstructor http://www.gap-system.org/lib?type?IsInternalRep
+dataconstructor http://www.gap-system.org/lib?type?IsPositionalObjectRep
+dataconstructor http://www.gap-system.org/lib?type?IsFamilyOfFamilies
+dataconstructor http://www.gap-system.org/lib?type?IsFamilyOfFamilies_st0
+dataconstructor http://www.gap-system.org/lib?type?IsFamilyDefaultRep
+dataconstructor http://www.gap-system.org/lib?type?IsFamilyDefaultRep_st0
+dataconstructor http://www.gap-system.org/lib?type?IsDataObjectRep
+dataconstructor http://www.gap-system.org/lib?type?IsNonAtomicComponentObjectRep
+dataconstructor http://www.gap-system.org/lib?type?IsNonAtomicComponentObjectRep_st0
+dataconstructor http://www.gap-system.org/lib?type?IsFamilyOfTypes
+dataconstructor http://www.gap-system.org/lib?type?IsFamilyOfTypes_st0
+dataconstructor http://www.gap-system.org/lib?type?IsTypeDefaultRep
+dataconstructor http://www.gap-system.org/lib?type?IsTypeDefaultRep_st0
+dataconstructor http://www.gap-system.org/lib?type?IsType
+dataconstructor http://www.gap-system.org/lib?type?IsReadOnlyPositionalObjectRep
+dataconstructor http://www.gap-system.org/lib?type?IsReadOnlyPositionalObjectRep_st0
+dataconstructor http://www.gap-system.org/lib?type?IsAtomicPositionalObjectRep
+dataconstructor http://www.gap-system.org/lib?type?IsAtomicPositionalObjectRep_st0
 theory http://www.gap-system.org/lib?type
 HasMeta http://www.gap-system.org/lib?type http://www.gap-system.org/?Types
 Declares http://www.gap-system.org/lib?type http://www.gap-system.org/lib?type?IsFamily
 constant http://www.gap-system.org/lib?type?IsFamily
 Declares http://www.gap-system.org/lib?type http://www.gap-system.org/lib?type?IsComponentObjectRep
 constant http://www.gap-system.org/lib?type?IsComponentObjectRep
-Includes http://www.gap-system.org/lib?type http://www.gap-system.org/lib?type
 Declares http://www.gap-system.org/lib?type http://www.gap-system.org/lib?type?IsAttributeStoringRep
 constant http://www.gap-system.org/lib?type?IsAttributeStoringRep
 Declares http://www.gap-system.org/lib?type http://www.gap-system.org/lib?type?IsAttributeStoringRep_st0
diff --git a/relational/http..www.gap-system.org/lib/unknown.rel b/relational/http..www.gap-system.org/lib/unknown.rel
index a0ccd13aac56179d68d0779f62e516d6cce19b83..1abaab67e34b33981aaaa39362b28d2d81b9adb0 100644
--- a/relational/http..www.gap-system.org/lib/unknown.rel
+++ b/relational/http..www.gap-system.org/lib/unknown.rel
@@ -19,6 +19,25 @@ implies http://www.gap-system.org/lib?unknown?IsUnknownDefaultRep_st0 http://www
 IsAttribute http://www.gap-system.org/lib?unknown?Unknown
 implies http://www.gap-system.org/lib?unknown?Unknown http://www.gap-system.org/lib?cyclotom?IsInt
 implies http://www.gap-system.org/lib?unknown?Unknown http://www.gap-system.org/lib?cyclotom?IsPosRat
+dataconstructor http://www.gap-system.org/lib?unknown?IsUnknown
+dataconstructor http://www.gap-system.org/lib?unknown?IsUnknown_st0
+dataconstructor http://www.gap-system.org/lib?unknown?IsUnknown_st1
+dataconstructor http://www.gap-system.org/lib?unknown?IsUnknown_st2
+dataconstructor http://www.gap-system.org/lib?unknown?IsUnknown_st3
+dataconstructor http://www.gap-system.org/lib?unknown?IsUnknown_st4
+dataconstructor http://www.gap-system.org/lib?unknown?IsUnknown_st5
+dataconstructor http://www.gap-system.org/lib?unknown?IsUnknown_st6
+dataconstructor http://www.gap-system.org/lib?unknown?IsUnknown_st7
+dataconstructor http://www.gap-system.org/lib?unknown?IsUnknown_st8
+dataconstructor http://www.gap-system.org/lib?unknown?IsUnknown_st9
+dataconstructor http://www.gap-system.org/lib?unknown?IsUnknown_st10
+dataconstructor http://www.gap-system.org/lib?unknown?IsUnknown_st11
+dataconstructor http://www.gap-system.org/lib?unknown?IsUnknown_st12
+dataconstructor http://www.gap-system.org/lib?unknown?IsUnknown_st13
+dataconstructor http://www.gap-system.org/lib?unknown?IsUnknown_st14
+dataconstructor http://www.gap-system.org/lib?unknown?IsUnknownDefaultRep
+dataconstructor http://www.gap-system.org/lib?unknown?IsUnknownDefaultRep_st0
+dataconstructor http://www.gap-system.org/lib?unknown?Unknown
 theory http://www.gap-system.org/lib?unknown
 HasMeta http://www.gap-system.org/lib?unknown http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?unknown http://www.gap-system.org/lib?arith
diff --git a/relational/http..www.gap-system.org/lib/upoly.rel b/relational/http..www.gap-system.org/lib/upoly.rel
index d1e3d36905895ca5e869a3e5e11349f5c559b2ba..bc92c76f7bc2eb2b7170c44e16e9f2e638d2a0a8 100644
--- a/relational/http..www.gap-system.org/lib/upoly.rel
+++ b/relational/http..www.gap-system.org/lib/upoly.rel
@@ -29,6 +29,10 @@ implies http://www.gap-system.org/lib?upoly?IsPrimitivePolynomial http://www.gap
 implies http://www.gap-system.org/lib?upoly?IsPrimitivePolynomial http://www.gap-system.org/lib?semiring?IsRDistributive
 implies http://www.gap-system.org/lib?upoly?IsPrimitivePolynomial http://www.gap-system.org/lib?ring?IsEuclideanRing
 implies http://www.gap-system.org/lib?upoly?IsPrimitivePolynomial http://www.gap-system.org/lib?ratfun?IsRationalFunction
+dataconstructor http://www.gap-system.org/lib?upoly?FactorsSquarefree
+dataconstructor http://www.gap-system.org/lib?upoly?IrrFacsPol
+dataconstructor http://www.gap-system.org/lib?upoly?SplittingField
+dataconstructor http://www.gap-system.org/lib?upoly?IsPrimitivePolynomial
 theory http://www.gap-system.org/lib?upoly
 HasMeta http://www.gap-system.org/lib?upoly http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?upoly http://www.gap-system.org/lib?ringpoly
diff --git a/relational/http..www.gap-system.org/lib/variable.rel b/relational/http..www.gap-system.org/lib/variable.rel
index 520735390e1707a26fa008f0b3d5220f674a4c23..4d81cabe3da21f7c80c4ede9ed35b9b21787ebc5 100644
--- a/relational/http..www.gap-system.org/lib/variable.rel
+++ b/relational/http..www.gap-system.org/lib/variable.rel
@@ -1,6 +1,9 @@
 IsFilter http://www.gap-system.org/lib?variable?IsLVarsBag
 IsFilter http://www.gap-system.org/lib?variable?IsToBeDefinedObj
 IsAttribute http://www.gap-system.org/lib?variable?FlushCaches
+dataconstructor http://www.gap-system.org/lib?variable?IsLVarsBag
+dataconstructor http://www.gap-system.org/lib?variable?IsToBeDefinedObj
+dataconstructor http://www.gap-system.org/lib?variable?FlushCaches
 theory http://www.gap-system.org/lib?variable
 HasMeta http://www.gap-system.org/lib?variable http://www.gap-system.org/?Types
 Declares http://www.gap-system.org/lib?variable http://www.gap-system.org/lib?variable?IsLVarsBag
diff --git a/relational/http..www.gap-system.org/lib/vec8bit.rel b/relational/http..www.gap-system.org/lib/vec8bit.rel
index 6eeaf71bfecf266de41afae35c45c42fd996dd4b..ac63a51e269269553aa21a273089f0195f7e4d66 100644
--- a/relational/http..www.gap-system.org/lib/vec8bit.rel
+++ b/relational/http..www.gap-system.org/lib/vec8bit.rel
@@ -9,6 +9,17 @@ implies http://www.gap-system.org/lib?vec8bit?Is8BitVectorRep_st9 http://www.gap
 implies http://www.gap-system.org/lib?vec8bit?Is8BitVectorRep_st9 http://www.gap-system.org/lib?arith?IsExtLElement
 implies http://www.gap-system.org/lib?vec8bit?Is8BitVectorRep_st9 http://www.gap-system.org/lib?arith?IsExtRElement
 implies http://www.gap-system.org/lib?vec8bit?Is8BitVectorRep_st9 http://www.gap-system.org/lib?matobj1?IsRowVectorObj
+dataconstructor http://www.gap-system.org/lib?vec8bit?Is8BitVectorRep
+dataconstructor http://www.gap-system.org/lib?vec8bit?Is8BitVectorRep_st0
+dataconstructor http://www.gap-system.org/lib?vec8bit?Is8BitVectorRep_st1
+dataconstructor http://www.gap-system.org/lib?vec8bit?Is8BitVectorRep_st2
+dataconstructor http://www.gap-system.org/lib?vec8bit?Is8BitVectorRep_st3
+dataconstructor http://www.gap-system.org/lib?vec8bit?Is8BitVectorRep_st4
+dataconstructor http://www.gap-system.org/lib?vec8bit?Is8BitVectorRep_st5
+dataconstructor http://www.gap-system.org/lib?vec8bit?Is8BitVectorRep_st6
+dataconstructor http://www.gap-system.org/lib?vec8bit?Is8BitVectorRep_st7
+dataconstructor http://www.gap-system.org/lib?vec8bit?Is8BitVectorRep_st8
+dataconstructor http://www.gap-system.org/lib?vec8bit?Is8BitVectorRep_st9
 theory http://www.gap-system.org/lib?vec8bit
 HasMeta http://www.gap-system.org/lib?vec8bit http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?vec8bit http://www.gap-system.org/lib?object
diff --git a/relational/http..www.gap-system.org/lib/vecmat.rel b/relational/http..www.gap-system.org/lib/vecmat.rel
index c43cf7bd7dd12253cdc477f46af52f716960a519..e73130dd6e1ee4e51abda0a4f0cdc830709b7795 100644
--- a/relational/http..www.gap-system.org/lib/vecmat.rel
+++ b/relational/http..www.gap-system.org/lib/vecmat.rel
@@ -39,6 +39,35 @@ implies http://www.gap-system.org/lib?vecmat?ImmutableMatrix http://www.gap-syst
 implies http://www.gap-system.org/lib?vecmat?ImmutableMatrix http://www.gap-system.org/lib?arith?IsNearAdditiveElementWithInverse
 implies http://www.gap-system.org/lib?vecmat?ImmutableMatrix http://www.gap-system.org/lib?arith?IsAdditiveElement
 implies http://www.gap-system.org/lib?vecmat?ImmutableMatrix http://www.gap-system.org/lib?arith?IsMultiplicativeElement
+dataconstructor http://www.gap-system.org/lib?vecmat?NumberFFVector
+dataconstructor http://www.gap-system.org/lib?vecmat?IsGF2VectorRep
+dataconstructor http://www.gap-system.org/lib?vecmat?IsGF2VectorRep_st0
+dataconstructor http://www.gap-system.org/lib?vecmat?IsGF2VectorRep_st1
+dataconstructor http://www.gap-system.org/lib?vecmat?IsGF2VectorRep_st2
+dataconstructor http://www.gap-system.org/lib?vecmat?IsGF2VectorRep_st3
+dataconstructor http://www.gap-system.org/lib?vecmat?IsGF2VectorRep_st4
+dataconstructor http://www.gap-system.org/lib?vecmat?IsGF2VectorRep_st5
+dataconstructor http://www.gap-system.org/lib?vecmat?IsGF2VectorRep_st6
+dataconstructor http://www.gap-system.org/lib?vecmat?IsGF2VectorRep_st7
+dataconstructor http://www.gap-system.org/lib?vecmat?IsGF2VectorRep_st8
+dataconstructor http://www.gap-system.org/lib?vecmat?IsGF2VectorRep_st9
+dataconstructor http://www.gap-system.org/lib?vecmat?IsLockedRepresentationVector
+dataconstructor http://www.gap-system.org/lib?vecmat?IsGF2MatrixRep
+dataconstructor http://www.gap-system.org/lib?vecmat?IsGF2MatrixRep_st0
+dataconstructor http://www.gap-system.org/lib?vecmat?IsGF2MatrixRep_st1
+dataconstructor http://www.gap-system.org/lib?vecmat?IsGF2MatrixRep_st2
+dataconstructor http://www.gap-system.org/lib?vecmat?IsGF2MatrixRep_st3
+dataconstructor http://www.gap-system.org/lib?vecmat?IsGF2MatrixRep_st4
+dataconstructor http://www.gap-system.org/lib?vecmat?IsGF2MatrixRep_st5
+dataconstructor http://www.gap-system.org/lib?vecmat?IsGF2MatrixRep_st6
+dataconstructor http://www.gap-system.org/lib?vecmat?IsGF2MatrixRep_st7
+dataconstructor http://www.gap-system.org/lib?vecmat?IsGF2MatrixRep_st8
+dataconstructor http://www.gap-system.org/lib?vecmat?IsGF2MatrixRep_st9
+dataconstructor http://www.gap-system.org/lib?vecmat?IsGF2MatrixRep_st10
+dataconstructor http://www.gap-system.org/lib?vecmat?IsGF2MatrixRep_st11
+dataconstructor http://www.gap-system.org/lib?vecmat?IsGF2MatrixRep_st12
+dataconstructor http://www.gap-system.org/lib?vecmat?IsGF2MatrixRep_st13
+dataconstructor http://www.gap-system.org/lib?vecmat?ImmutableMatrix
 theory http://www.gap-system.org/lib?vecmat
 HasMeta http://www.gap-system.org/lib?vecmat http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?vecmat http://www.gap-system.org/lib?list
diff --git a/relational/http..www.gap-system.org/lib/vspc.rel b/relational/http..www.gap-system.org/lib/vspc.rel
index 5b7d20f34916970085f36eefc31c98b3babec6c8..e1408252425dcf6097becb15ee01be0434570513 100644
--- a/relational/http..www.gap-system.org/lib/vspc.rel
+++ b/relational/http..www.gap-system.org/lib/vspc.rel
@@ -209,6 +209,110 @@ implies http://www.gap-system.org/lib?vspc?IsGaussianMatrixSpace http://www.gap-
 implies http://www.gap-system.org/lib?vspc?IsGaussianMatrixSpace http://www.gap-system.org/lib?addmagma?IsAdditivelyCommutative
 implies http://www.gap-system.org/lib?vspc?IsGaussianMatrixSpace http://www.gap-system.org/lib?module?IsMatrixModule
 implies http://www.gap-system.org/lib?vspc?IsGaussianMatrixSpace http://www.gap-system.org/lib?vspc?IsGaussianSpace
+dataconstructor http://www.gap-system.org/lib?vspc?IsSubspacesVectorSpaceDefaultRep
+dataconstructor http://www.gap-system.org/lib?vspc?IsSubspacesVectorSpaceDefaultRep_st0
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianRowSpace
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianRowSpace_st0
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianRowSpace_st1
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianRowSpace_st2
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianRowSpace_st3
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianRowSpace_st4
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianRowSpace_st5
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianRowSpace_st6
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianRowSpace_st7
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianRowSpace_st8
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianRowSpace_st9
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianRowSpace_st10
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianRowSpace_st11
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianRowSpace_st12
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianRowSpace_st13
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianRowSpace_st14
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianRowSpace_st15
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianRowSpace_st16
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianRowSpace_st17
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianRowSpace_st18
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianRowSpace_st19
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianRowSpace_st20
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianRowSpace_st21
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianRowSpace_st22
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianRowSpace_st23
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianRowSpace_st24
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianRowSpace_st25
+dataconstructor http://www.gap-system.org/lib?vspc?IsLeftVectorSpace
+dataconstructor http://www.gap-system.org/lib?vspc?IsMatrixSpace
+dataconstructor http://www.gap-system.org/lib?vspc?IsGaussianSpace
+dataconstructor http://www.gap-system.org/lib?vspc?IsGaussianSpace_st0
+dataconstructor http://www.gap-system.org/lib?vspc?IsGaussianSpace_st1
+dataconstructor http://www.gap-system.org/lib?vspc?IsGaussianSpace_st2
+dataconstructor http://www.gap-system.org/lib?vspc?IsGaussianSpace_st3
+dataconstructor http://www.gap-system.org/lib?vspc?IsGaussianSpace_st4
+dataconstructor http://www.gap-system.org/lib?vspc?IsGaussianSpace_st5
+dataconstructor http://www.gap-system.org/lib?vspc?IsGaussianSpace_st6
+dataconstructor http://www.gap-system.org/lib?vspc?IsGaussianSpace_st7
+dataconstructor http://www.gap-system.org/lib?vspc?IsGaussianSpace_st8
+dataconstructor http://www.gap-system.org/lib?vspc?IsGaussianSpace_st9
+dataconstructor http://www.gap-system.org/lib?vspc?IsGaussianSpace_st10
+dataconstructor http://www.gap-system.org/lib?vspc?IsGaussianSpace_st11
+dataconstructor http://www.gap-system.org/lib?vspc?IsGaussianSpace_st12
+dataconstructor http://www.gap-system.org/lib?vspc?IsGaussianSpace_st13
+dataconstructor http://www.gap-system.org/lib?vspc?IsGaussianSpace_st14
+dataconstructor http://www.gap-system.org/lib?vspc?IsGaussianSpace_st15
+dataconstructor http://www.gap-system.org/lib?vspc?IsGaussianSpace_st16
+dataconstructor http://www.gap-system.org/lib?vspc?IsGaussianSpace_st17
+dataconstructor http://www.gap-system.org/lib?vspc?IsGaussianSpace_st18
+dataconstructor http://www.gap-system.org/lib?vspc?IsGaussianSpace_st19
+dataconstructor http://www.gap-system.org/lib?vspc?IsGaussianSpace_st20
+dataconstructor http://www.gap-system.org/lib?vspc?IsGaussianSpace_st21
+dataconstructor http://www.gap-system.org/lib?vspc?IsGaussianSpace_st22
+dataconstructor http://www.gap-system.org/lib?vspc?IsGaussianSpace_st23
+dataconstructor http://www.gap-system.org/lib?vspc?IsGaussianSpace_st24
+dataconstructor http://www.gap-system.org/lib?vspc?OrthogonalSpaceInFullRowSpace
+dataconstructor http://www.gap-system.org/lib?vspc?CanonicalBasis
+dataconstructor http://www.gap-system.org/lib?vspc?AsSubspace
+dataconstructor http://www.gap-system.org/lib?vspc?Subspaces
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianMatrixSpace
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianMatrixSpace_st0
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianMatrixSpace_st1
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianMatrixSpace_st2
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianMatrixSpace_st3
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianMatrixSpace_st4
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianMatrixSpace_st5
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianMatrixSpace_st6
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianMatrixSpace_st7
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianMatrixSpace_st8
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianMatrixSpace_st9
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianMatrixSpace_st10
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianMatrixSpace_st11
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianMatrixSpace_st12
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianMatrixSpace_st13
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianMatrixSpace_st14
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianMatrixSpace_st15
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianMatrixSpace_st16
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianMatrixSpace_st17
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianMatrixSpace_st18
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianMatrixSpace_st19
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianMatrixSpace_st20
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianMatrixSpace_st21
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianMatrixSpace_st22
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianMatrixSpace_st23
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianMatrixSpace_st24
+dataconstructor http://www.gap-system.org/lib?vspc?IsNonGaussianMatrixSpace_st25
+dataconstructor http://www.gap-system.org/lib?vspc?IsLeftOperatorRingWithOne
+dataconstructor http://www.gap-system.org/lib?vspc?IsRowSpace
+dataconstructor http://www.gap-system.org/lib?vspc?IsLeftOperatorRing
+dataconstructor http://www.gap-system.org/lib?vspc?IsDivisionRing
+dataconstructor http://www.gap-system.org/lib?vspc?IsVectorSpaceHomomorphism
+dataconstructor http://www.gap-system.org/lib?vspc?IsSubspacesVectorSpace
+dataconstructor http://www.gap-system.org/lib?vspc?IsSubspacesVectorSpace_st0
+dataconstructor http://www.gap-system.org/lib?vspc?IsSubspacesVectorSpace_st1
+dataconstructor http://www.gap-system.org/lib?vspc?IsSubspacesVectorSpace_st2
+dataconstructor http://www.gap-system.org/lib?vspc?IsSubspacesVectorSpace_st3
+dataconstructor http://www.gap-system.org/lib?vspc?IsSubspacesVectorSpace_st4
+dataconstructor http://www.gap-system.org/lib?vspc?IsSubspacesVectorSpace_st5
+dataconstructor http://www.gap-system.org/lib?vspc?IsSubspacesVectorSpace_st6
+dataconstructor http://www.gap-system.org/lib?vspc?IsGaussianRowSpace
+dataconstructor http://www.gap-system.org/lib?vspc?NormedRowVectors
+dataconstructor http://www.gap-system.org/lib?vspc?IsGaussianMatrixSpace
 theory http://www.gap-system.org/lib?vspc
 HasMeta http://www.gap-system.org/lib?vspc http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?vspc http://www.gap-system.org/lib?type
@@ -333,7 +437,6 @@ Declares http://www.gap-system.org/lib?vspc http://www.gap-system.org/lib?vspc?I
 constant http://www.gap-system.org/lib?vspc?IsGaussianSpace_st23
 Declares http://www.gap-system.org/lib?vspc http://www.gap-system.org/lib?vspc?IsGaussianSpace_st24
 constant http://www.gap-system.org/lib?vspc?IsGaussianSpace_st24
-Includes http://www.gap-system.org/lib?vspc http://www.gap-system.org/lib?vspc
 Declares http://www.gap-system.org/lib?vspc http://www.gap-system.org/lib?vspc?OrthogonalSpaceInFullRowSpace
 constant http://www.gap-system.org/lib?vspc?OrthogonalSpaceInFullRowSpace
 Declares http://www.gap-system.org/lib?vspc http://www.gap-system.org/lib?vspc?CanonicalBasis
diff --git a/relational/http..www.gap-system.org/lib/vspchom.rel b/relational/http..www.gap-system.org/lib/vspchom.rel
index ff82bfbe9065244ed69d8d46545bfb92d85e6bcc..4d44d3d96963cb2563edcb3f0edf2436289ea357 100644
--- a/relational/http..www.gap-system.org/lib/vspchom.rel
+++ b/relational/http..www.gap-system.org/lib/vspchom.rel
@@ -99,6 +99,50 @@ implies http://www.gap-system.org/lib?vspchom?LeftModuleGeneralMappingByImages h
 implies http://www.gap-system.org/lib?vspchom?LeftModuleGeneralMappingByImages http://www.gap-system.org/lib?addmagma?IsNearAdditiveGroup
 implies http://www.gap-system.org/lib?vspchom?LeftModuleGeneralMappingByImages http://www.gap-system.org/lib?addmagma?IsAdditivelyCommutative
 implies http://www.gap-system.org/lib?vspchom?LeftModuleGeneralMappingByImages http://www.gap-system.org/lib?list?IsHomogeneousList
+dataconstructor http://www.gap-system.org/lib?vspchom?IsLinearMappingByMatrixDefaultRep
+dataconstructor http://www.gap-system.org/lib?vspchom?IsLinearMappingByMatrixDefaultRep_st0
+dataconstructor http://www.gap-system.org/lib?vspchom?IsLinearMappingByMatrixDefaultRep_st1
+dataconstructor http://www.gap-system.org/lib?vspchom?NaturalHomomorphismBySubspace
+dataconstructor http://www.gap-system.org/lib?vspchom?LeftModuleHomomorphismByMatrix
+dataconstructor http://www.gap-system.org/lib?vspchom?AsLeftModuleGeneralMappingByImages
+dataconstructor http://www.gap-system.org/lib?vspchom?IsFullHomModule
+dataconstructor http://www.gap-system.org/lib?vspchom?End
+dataconstructor http://www.gap-system.org/lib?vspchom?IsPseudoCanonicalBasisFullHomModule
+dataconstructor http://www.gap-system.org/lib?vspchom?IsLinearMappingsModule
+dataconstructor http://www.gap-system.org/lib?vspchom?IsLinearMappingsModule_st0
+dataconstructor http://www.gap-system.org/lib?vspchom?IsLinearMappingsModule_st1
+dataconstructor http://www.gap-system.org/lib?vspchom?IsLinearMappingsModule_st2
+dataconstructor http://www.gap-system.org/lib?vspchom?IsLinearMappingsModule_st3
+dataconstructor http://www.gap-system.org/lib?vspchom?IsLinearMappingsModule_st4
+dataconstructor http://www.gap-system.org/lib?vspchom?IsLinearMappingsModule_st5
+dataconstructor http://www.gap-system.org/lib?vspchom?IsLinearMappingsModule_st6
+dataconstructor http://www.gap-system.org/lib?vspchom?IsLinearMappingsModule_st7
+dataconstructor http://www.gap-system.org/lib?vspchom?IsLinearMappingsModule_st8
+dataconstructor http://www.gap-system.org/lib?vspchom?IsLinearMappingsModule_st9
+dataconstructor http://www.gap-system.org/lib?vspchom?IsLinearMappingsModule_st10
+dataconstructor http://www.gap-system.org/lib?vspchom?IsLinearMappingsModule_st11
+dataconstructor http://www.gap-system.org/lib?vspchom?IsLinearMappingsModule_st12
+dataconstructor http://www.gap-system.org/lib?vspchom?IsLinearMappingsModule_st13
+dataconstructor http://www.gap-system.org/lib?vspchom?IsLinearMappingsModule_st14
+dataconstructor http://www.gap-system.org/lib?vspchom?IsLinearMappingsModule_st15
+dataconstructor http://www.gap-system.org/lib?vspchom?IsLinearMappingsModule_st16
+dataconstructor http://www.gap-system.org/lib?vspchom?IsLinearMappingsModule_st17
+dataconstructor http://www.gap-system.org/lib?vspchom?IsLinearMappingsModule_st18
+dataconstructor http://www.gap-system.org/lib?vspchom?IsLinearMappingsModule_st19
+dataconstructor http://www.gap-system.org/lib?vspchom?IsLinearMappingsModule_st20
+dataconstructor http://www.gap-system.org/lib?vspchom?IsLinearMappingsModule_st21
+dataconstructor http://www.gap-system.org/lib?vspchom?IsLinearMappingsModule_st22
+dataconstructor http://www.gap-system.org/lib?vspchom?IsLinearMappingsModule_st23
+dataconstructor http://www.gap-system.org/lib?vspchom?IsLinearMappingsModule_st24
+dataconstructor http://www.gap-system.org/lib?vspchom?IsLinearMappingsModule_st25
+dataconstructor http://www.gap-system.org/lib?vspchom?IsLinearMappingsModule_st26
+dataconstructor http://www.gap-system.org/lib?vspchom?IsLinearMappingsModule_st27
+dataconstructor http://www.gap-system.org/lib?vspchom?LeftModuleHomomorphismByImagesNC
+dataconstructor http://www.gap-system.org/lib?vspchom?Hom
+dataconstructor http://www.gap-system.org/lib?vspchom?IsLinearGeneralMappingByImagesDefaultRep
+dataconstructor http://www.gap-system.org/lib?vspchom?IsLinearGeneralMappingByImagesDefaultRep_st0
+dataconstructor http://www.gap-system.org/lib?vspchom?IsLinearGeneralMappingByImagesDefaultRep_st1
+dataconstructor http://www.gap-system.org/lib?vspchom?LeftModuleGeneralMappingByImages
 theory http://www.gap-system.org/lib?vspchom
 HasMeta http://www.gap-system.org/lib?vspchom http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?vspchom http://www.gap-system.org/lib?type
diff --git a/relational/http..www.gap-system.org/lib/vspcmat.rel b/relational/http..www.gap-system.org/lib/vspcmat.rel
index ae377ff752ae432ffa5c46136ea3e7132a36e000..04d9b7daee20bd69e8e086a2989eb54077c7f570 100644
--- a/relational/http..www.gap-system.org/lib/vspcmat.rel
+++ b/relational/http..www.gap-system.org/lib/vspcmat.rel
@@ -3,6 +3,11 @@ implies http://www.gap-system.org/lib?vspcmat?IsSemiEchelonBasisOfGaussianMatrix
 implies http://www.gap-system.org/lib?vspcmat?IsSemiEchelonBasisOfGaussianMatrixSpaceRep_st1 http://www.gap-system.org/lib?type?IsAttributeStoringRep
 IsFilter http://www.gap-system.org/lib?vspcmat?IsMutableBasisOfGaussianMatrixSpaceRep
 implies http://www.gap-system.org/lib?vspcmat?IsMutableBasisOfGaussianMatrixSpaceRep_st0 http://www.gap-system.org/lib?type?IsComponentObjectRep
+dataconstructor http://www.gap-system.org/lib?vspcmat?IsSemiEchelonBasisOfGaussianMatrixSpaceRep
+dataconstructor http://www.gap-system.org/lib?vspcmat?IsSemiEchelonBasisOfGaussianMatrixSpaceRep_st0
+dataconstructor http://www.gap-system.org/lib?vspcmat?IsSemiEchelonBasisOfGaussianMatrixSpaceRep_st1
+dataconstructor http://www.gap-system.org/lib?vspcmat?IsMutableBasisOfGaussianMatrixSpaceRep
+dataconstructor http://www.gap-system.org/lib?vspcmat?IsMutableBasisOfGaussianMatrixSpaceRep_st0
 theory http://www.gap-system.org/lib?vspcmat
 HasMeta http://www.gap-system.org/lib?vspcmat http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?vspcmat http://www.gap-system.org/lib?type
diff --git a/relational/http..www.gap-system.org/lib/vspcrow.rel b/relational/http..www.gap-system.org/lib/vspcrow.rel
index cd15548d6c9d9d8414761b821192880f314e6c4a..505191df5acce00f11489fa95cc39b928eae5161 100644
--- a/relational/http..www.gap-system.org/lib/vspcrow.rel
+++ b/relational/http..www.gap-system.org/lib/vspcrow.rel
@@ -6,6 +6,14 @@ implies http://www.gap-system.org/lib?vspcrow?IsMutableBasisOfGaussianRowSpaceRe
 IsFilter http://www.gap-system.org/lib?vspcrow?IsSemiEchelonBasisOfGaussianRowSpaceRep
 implies http://www.gap-system.org/lib?vspcrow?IsSemiEchelonBasisOfGaussianRowSpaceRep_st1 http://www.gap-system.org/lib?type?IsComponentObjectRep
 implies http://www.gap-system.org/lib?vspcrow?IsSemiEchelonBasisOfGaussianRowSpaceRep_st1 http://www.gap-system.org/lib?type?IsAttributeStoringRep
+dataconstructor http://www.gap-system.org/lib?vspcrow?IsSubspacesFullRowSpaceDefaultRep
+dataconstructor http://www.gap-system.org/lib?vspcrow?IsSubspacesFullRowSpaceDefaultRep_st0
+dataconstructor http://www.gap-system.org/lib?vspcrow?IsSubspacesFullRowSpaceDefaultRep_st1
+dataconstructor http://www.gap-system.org/lib?vspcrow?IsMutableBasisOfGaussianRowSpaceRep
+dataconstructor http://www.gap-system.org/lib?vspcrow?IsMutableBasisOfGaussianRowSpaceRep_st0
+dataconstructor http://www.gap-system.org/lib?vspcrow?IsSemiEchelonBasisOfGaussianRowSpaceRep
+dataconstructor http://www.gap-system.org/lib?vspcrow?IsSemiEchelonBasisOfGaussianRowSpaceRep_st0
+dataconstructor http://www.gap-system.org/lib?vspcrow?IsSemiEchelonBasisOfGaussianRowSpaceRep_st1
 theory http://www.gap-system.org/lib?vspcrow
 HasMeta http://www.gap-system.org/lib?vspcrow http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?vspcrow http://www.gap-system.org/lib?type
diff --git a/relational/http..www.gap-system.org/lib/word.rel b/relational/http..www.gap-system.org/lib/word.rel
index 4173cc0986c29d793b87be865b84334b44fedcae..f8fe8f46b652c97e4e33d24f662e023ace404582 100644
--- a/relational/http..www.gap-system.org/lib/word.rel
+++ b/relational/http..www.gap-system.org/lib/word.rel
@@ -39,6 +39,38 @@ implies http://www.gap-system.org/lib?word?IsNonassocWordWithOneCollection_st10
 implies http://www.gap-system.org/lib?word?IsNonassocWordWithOneCollection_st10 http://www.gap-system.org/lib?arith?IsMultiplicativeElementWithOne
 implies http://www.gap-system.org/lib?word?IsNonassocWordWithOneCollection_st10 http://www.gap-system.org/lib?word?IsWord
 implies http://www.gap-system.org/lib?word?IsNonassocWordWithOneCollection_st10 http://www.gap-system.org/lib?word?IsNonassocWord
+dataconstructor http://www.gap-system.org/lib?word?IsWord
+dataconstructor http://www.gap-system.org/lib?word?IsWord_st0
+dataconstructor http://www.gap-system.org/lib?word?IsWord_st1
+dataconstructor http://www.gap-system.org/lib?word?IsWord_st2
+dataconstructor http://www.gap-system.org/lib?word?IsWordWithOne
+dataconstructor http://www.gap-system.org/lib?word?IsNonassocWord
+dataconstructor http://www.gap-system.org/lib?word?IsNonassocWord_st0
+dataconstructor http://www.gap-system.org/lib?word?IsNonassocWord_st1
+dataconstructor http://www.gap-system.org/lib?word?IsNonassocWord_st2
+dataconstructor http://www.gap-system.org/lib?word?IsNonassocWord_st3
+dataconstructor http://www.gap-system.org/lib?word?IsNonassocWordWithOneFamily
+dataconstructor http://www.gap-system.org/lib?word?IsNonassocWordWithOneFamily_st0
+dataconstructor http://www.gap-system.org/lib?word?IsNonassocWordWithOneFamily_st1
+dataconstructor http://www.gap-system.org/lib?word?IsNonassocWordWithOneFamily_st2
+dataconstructor http://www.gap-system.org/lib?word?MappedWord
+dataconstructor http://www.gap-system.org/lib?word?IsNonassocWordWithOne
+dataconstructor http://www.gap-system.org/lib?word?IsBracketRep
+dataconstructor http://www.gap-system.org/lib?word?IsBracketRep_st0
+dataconstructor http://www.gap-system.org/lib?word?IsWordWithInverse
+dataconstructor http://www.gap-system.org/lib?word?IsFreeMagma
+dataconstructor http://www.gap-system.org/lib?word?IsNonassocWordWithOneCollection
+dataconstructor http://www.gap-system.org/lib?word?IsNonassocWordWithOneCollection_st0
+dataconstructor http://www.gap-system.org/lib?word?IsNonassocWordWithOneCollection_st1
+dataconstructor http://www.gap-system.org/lib?word?IsNonassocWordWithOneCollection_st2
+dataconstructor http://www.gap-system.org/lib?word?IsNonassocWordWithOneCollection_st3
+dataconstructor http://www.gap-system.org/lib?word?IsNonassocWordWithOneCollection_st4
+dataconstructor http://www.gap-system.org/lib?word?IsNonassocWordWithOneCollection_st5
+dataconstructor http://www.gap-system.org/lib?word?IsNonassocWordWithOneCollection_st6
+dataconstructor http://www.gap-system.org/lib?word?IsNonassocWordWithOneCollection_st7
+dataconstructor http://www.gap-system.org/lib?word?IsNonassocWordWithOneCollection_st8
+dataconstructor http://www.gap-system.org/lib?word?IsNonassocWordWithOneCollection_st9
+dataconstructor http://www.gap-system.org/lib?word?IsNonassocWordWithOneCollection_st10
 theory http://www.gap-system.org/lib?word
 HasMeta http://www.gap-system.org/lib?word http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?word http://www.gap-system.org/lib?arith
@@ -50,7 +82,6 @@ Declares http://www.gap-system.org/lib?word http://www.gap-system.org/lib?word?I
 constant http://www.gap-system.org/lib?word?IsWord_st1
 Declares http://www.gap-system.org/lib?word http://www.gap-system.org/lib?word?IsWord_st2
 constant http://www.gap-system.org/lib?word?IsWord_st2
-Includes http://www.gap-system.org/lib?word http://www.gap-system.org/lib?word
 Declares http://www.gap-system.org/lib?word http://www.gap-system.org/lib?word?IsWordWithOne
 constant http://www.gap-system.org/lib?word?IsWordWithOne
 Declares http://www.gap-system.org/lib?word http://www.gap-system.org/lib?word?IsNonassocWord
diff --git a/relational/http..www.gap-system.org/lib/wordass.rel b/relational/http..www.gap-system.org/lib/wordass.rel
index f9457973734e9e60d3d8417c461056007092d3e2..3d5c055b23ac6e5147c604a4a52b3172ff607107 100644
--- a/relational/http..www.gap-system.org/lib/wordass.rel
+++ b/relational/http..www.gap-system.org/lib/wordass.rel
@@ -192,6 +192,142 @@ IsAttribute http://www.gap-system.org/lib?wordass?GeneratorSyllable
 implies http://www.gap-system.org/lib?wordass?GeneratorSyllable http://www.gap-system.org/lib?arith?IsAssociativeElement
 implies http://www.gap-system.org/lib?wordass?GeneratorSyllable http://www.gap-system.org/lib?word?IsWord
 implies http://www.gap-system.org/lib?wordass?GeneratorSyllable http://www.gap-system.org/lib?cyclotom?IsInt
+dataconstructor http://www.gap-system.org/lib?wordass?IsSyllableWordsFamily
+dataconstructor http://www.gap-system.org/lib?wordass?IsSyllableWordsFamily_st0
+dataconstructor http://www.gap-system.org/lib?wordass?IsSyllableWordsFamily_st1
+dataconstructor http://www.gap-system.org/lib?wordass?PositionWord
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWord
+dataconstructor http://www.gap-system.org/lib?wordass?Is16BitsFamily
+dataconstructor http://www.gap-system.org/lib?wordass?Is16BitsFamily_st0
+dataconstructor http://www.gap-system.org/lib?wordass?Is16BitsFamily_st1
+dataconstructor http://www.gap-system.org/lib?wordass?Is16BitsFamily_st2
+dataconstructor http://www.gap-system.org/lib?wordass?ExponentSums
+dataconstructor http://www.gap-system.org/lib?wordass?ExponentSumWord
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordCollection
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordCollection_st0
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordCollection_st1
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordCollection_st2
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordCollection_st3
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordCollection_st4
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordCollection_st5
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordCollection_st6
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordCollection_st7
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordCollection_st8
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordCollection_st9
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordCollection_st10
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordCollection_st11
+dataconstructor http://www.gap-system.org/lib?wordass?IsSyllableAssocWordRep
+dataconstructor http://www.gap-system.org/lib?wordass?IsSyllableAssocWordRep_st0
+dataconstructor http://www.gap-system.org/lib?wordass?IsSyllableAssocWordRep_st1
+dataconstructor http://www.gap-system.org/lib?wordass?IsSyllableAssocWordRep_st2
+dataconstructor http://www.gap-system.org/lib?wordass?IsSyllableAssocWordRep_st3
+dataconstructor http://www.gap-system.org/lib?wordass?IsSyllableAssocWordRep_st4
+dataconstructor http://www.gap-system.org/lib?wordass?ExponentSyllable
+dataconstructor http://www.gap-system.org/lib?wordass?IsInfBitsFamily
+dataconstructor http://www.gap-system.org/lib?wordass?IsInfBitsFamily_st0
+dataconstructor http://www.gap-system.org/lib?wordass?IsInfBitsFamily_st1
+dataconstructor http://www.gap-system.org/lib?wordass?IsInfBitsFamily_st2
+dataconstructor http://www.gap-system.org/lib?wordass?IsLetterWordsFamily
+dataconstructor http://www.gap-system.org/lib?wordass?IsLetterWordsFamily_st0
+dataconstructor http://www.gap-system.org/lib?wordass?IsLetterWordsFamily_st1
+dataconstructor http://www.gap-system.org/lib?wordass?IsWLetterWordsFamily
+dataconstructor http://www.gap-system.org/lib?wordass?IsWLetterWordsFamily_st0
+dataconstructor http://www.gap-system.org/lib?wordass?IsWLetterWordsFamily_st1
+dataconstructor http://www.gap-system.org/lib?wordass?IsWLetterWordsFamily_st2
+dataconstructor http://www.gap-system.org/lib?wordass?SyllableRepAssocWord
+dataconstructor http://www.gap-system.org/lib?wordass?IsFreeMonoid
+dataconstructor http://www.gap-system.org/lib?wordass?Subword
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordFamily
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordFamily_st0
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordFamily_st1
+dataconstructor http://www.gap-system.org/lib?wordass?EliminatedWord
+dataconstructor http://www.gap-system.org/lib?wordass?SubSyllables
+dataconstructor http://www.gap-system.org/lib?wordass?LetterRepAssocWord
+dataconstructor http://www.gap-system.org/lib?wordass?AssignGeneratorVariables
+dataconstructor http://www.gap-system.org/lib?wordass?NumberSyllables
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordWithOneFamily
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordWithOneFamily_st0
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordWithOneFamily_st1
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordWithOneFamily_st2
+dataconstructor http://www.gap-system.org/lib?wordass?IsFreeGroup
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordWithOneCollection
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordWithOneCollection_st0
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordWithOneCollection_st1
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordWithOneCollection_st2
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordWithOneCollection_st3
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordWithOneCollection_st4
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordWithOneCollection_st5
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordWithOneCollection_st6
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordWithOneCollection_st7
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordWithOneCollection_st8
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordWithOneCollection_st9
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordWithOneCollection_st10
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordWithOneCollection_st11
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordWithOneCollection_st12
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordWithOneCollection_st13
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordWithInverseFamily
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordWithInverseFamily_st0
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordWithInverseFamily_st1
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordWithInverseFamily_st2
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordWithInverseFamily_st3
+dataconstructor http://www.gap-system.org/lib?wordass?Is8BitsFamily
+dataconstructor http://www.gap-system.org/lib?wordass?Is8BitsFamily_st0
+dataconstructor http://www.gap-system.org/lib?wordass?Is8BitsFamily_st1
+dataconstructor http://www.gap-system.org/lib?wordass?Is8BitsFamily_st2
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordWithOne
+dataconstructor http://www.gap-system.org/lib?wordass?Is32BitsFamily
+dataconstructor http://www.gap-system.org/lib?wordass?Is32BitsFamily_st0
+dataconstructor http://www.gap-system.org/lib?wordass?Is32BitsFamily_st1
+dataconstructor http://www.gap-system.org/lib?wordass?Is32BitsFamily_st2
+dataconstructor http://www.gap-system.org/lib?wordass?IsFreeSemigroup
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordWithInverse
+dataconstructor http://www.gap-system.org/lib?wordass?RenumberedWord
+dataconstructor http://www.gap-system.org/lib?wordass?SubstitutedWord
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordWithInverseCollection
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordWithInverseCollection_st0
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordWithInverseCollection_st1
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordWithInverseCollection_st2
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordWithInverseCollection_st3
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordWithInverseCollection_st4
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordWithInverseCollection_st5
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordWithInverseCollection_st6
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordWithInverseCollection_st7
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordWithInverseCollection_st8
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordWithInverseCollection_st9
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordWithInverseCollection_st10
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordWithInverseCollection_st11
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordWithInverseCollection_st12
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordWithInverseCollection_st13
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordWithInverseCollection_st14
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordWithInverseCollection_st15
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordWithInverseCollection_st16
+dataconstructor http://www.gap-system.org/lib?wordass?IsAssocWordWithInverseCollection_st17
+dataconstructor http://www.gap-system.org/lib?wordass?IsLetterAssocWordRep
+dataconstructor http://www.gap-system.org/lib?wordass?IsLetterAssocWordRep_st0
+dataconstructor http://www.gap-system.org/lib?wordass?IsLetterAssocWordRep_st1
+dataconstructor http://www.gap-system.org/lib?wordass?IsLetterAssocWordRep_st2
+dataconstructor http://www.gap-system.org/lib?wordass?IsLetterAssocWordRep_st3
+dataconstructor http://www.gap-system.org/lib?wordass?IsLetterAssocWordRep_st4
+dataconstructor http://www.gap-system.org/lib?wordass?IsWLetterAssocWordRep
+dataconstructor http://www.gap-system.org/lib?wordass?IsWLetterAssocWordRep_st0
+dataconstructor http://www.gap-system.org/lib?wordass?IsWLetterAssocWordRep_st1
+dataconstructor http://www.gap-system.org/lib?wordass?IsWLetterAssocWordRep_st2
+dataconstructor http://www.gap-system.org/lib?wordass?IsWLetterAssocWordRep_st3
+dataconstructor http://www.gap-system.org/lib?wordass?IsWLetterAssocWordRep_st4
+dataconstructor http://www.gap-system.org/lib?wordass?IsWLetterAssocWordRep_st5
+dataconstructor http://www.gap-system.org/lib?wordass?AssocWordByLetterRep
+dataconstructor http://www.gap-system.org/lib?wordass?IsBLetterWordsFamily
+dataconstructor http://www.gap-system.org/lib?wordass?IsBLetterWordsFamily_st0
+dataconstructor http://www.gap-system.org/lib?wordass?IsBLetterWordsFamily_st1
+dataconstructor http://www.gap-system.org/lib?wordass?IsBLetterWordsFamily_st2
+dataconstructor http://www.gap-system.org/lib?wordass?IsBLetterAssocWordRep
+dataconstructor http://www.gap-system.org/lib?wordass?IsBLetterAssocWordRep_st0
+dataconstructor http://www.gap-system.org/lib?wordass?IsBLetterAssocWordRep_st1
+dataconstructor http://www.gap-system.org/lib?wordass?IsBLetterAssocWordRep_st2
+dataconstructor http://www.gap-system.org/lib?wordass?IsBLetterAssocWordRep_st3
+dataconstructor http://www.gap-system.org/lib?wordass?IsBLetterAssocWordRep_st4
+dataconstructor http://www.gap-system.org/lib?wordass?IsBLetterAssocWordRep_st5
+dataconstructor http://www.gap-system.org/lib?wordass?GeneratorSyllable
 theory http://www.gap-system.org/lib?wordass
 HasMeta http://www.gap-system.org/lib?wordass http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?wordass http://www.gap-system.org/lib?type
@@ -208,7 +344,6 @@ Declares http://www.gap-system.org/lib?wordass http://www.gap-system.org/lib?wor
 constant http://www.gap-system.org/lib?wordass?PositionWord
 Declares http://www.gap-system.org/lib?wordass http://www.gap-system.org/lib?wordass?IsAssocWord
 constant http://www.gap-system.org/lib?wordass?IsAssocWord
-Includes http://www.gap-system.org/lib?wordass http://www.gap-system.org/lib?wordass
 Declares http://www.gap-system.org/lib?wordass http://www.gap-system.org/lib?wordass?Is16BitsFamily
 constant http://www.gap-system.org/lib?wordass?Is16BitsFamily
 Declares http://www.gap-system.org/lib?wordass http://www.gap-system.org/lib?wordass?Is16BitsFamily_st0
diff --git a/relational/http..www.gap-system.org/lib/wordrep.rel b/relational/http..www.gap-system.org/lib/wordrep.rel
index b3154ce97f53fbe43e659c5f81ae25b7b23045fc..624fa5f8d3fa8755ebb075b62935f6848a2f2c03 100644
--- a/relational/http..www.gap-system.org/lib/wordrep.rel
+++ b/relational/http..www.gap-system.org/lib/wordrep.rel
@@ -34,6 +34,42 @@ implies http://www.gap-system.org/lib?wordrep?IsInfBitsAssocWord_st6 http://www.
 implies http://www.gap-system.org/lib?wordrep?IsInfBitsAssocWord_st6 http://www.gap-system.org/lib?arith?IsAssociativeElement
 implies http://www.gap-system.org/lib?wordrep?IsInfBitsAssocWord_st6 http://www.gap-system.org/lib?word?IsWord
 implies http://www.gap-system.org/lib?wordrep?IsInfBitsAssocWord_st6 http://www.gap-system.org/lib?wordass?IsSyllableAssocWordRep
+dataconstructor http://www.gap-system.org/lib?wordrep?IsInfiniteListOfNamesRep
+dataconstructor http://www.gap-system.org/lib?wordrep?IsInfiniteListOfNamesRep_st0
+dataconstructor http://www.gap-system.org/lib?wordrep?IsInfiniteListOfGeneratorsRep
+dataconstructor http://www.gap-system.org/lib?wordrep?IsInfiniteListOfGeneratorsRep_st0
+dataconstructor http://www.gap-system.org/lib?wordrep?Is32BitsAssocWord
+dataconstructor http://www.gap-system.org/lib?wordrep?Is32BitsAssocWord_st0
+dataconstructor http://www.gap-system.org/lib?wordrep?Is32BitsAssocWord_st1
+dataconstructor http://www.gap-system.org/lib?wordrep?Is32BitsAssocWord_st2
+dataconstructor http://www.gap-system.org/lib?wordrep?Is32BitsAssocWord_st3
+dataconstructor http://www.gap-system.org/lib?wordrep?Is32BitsAssocWord_st4
+dataconstructor http://www.gap-system.org/lib?wordrep?Is32BitsAssocWord_st5
+dataconstructor http://www.gap-system.org/lib?wordrep?Is32BitsAssocWord_st6
+dataconstructor http://www.gap-system.org/lib?wordrep?Is16BitsAssocWord
+dataconstructor http://www.gap-system.org/lib?wordrep?Is16BitsAssocWord_st0
+dataconstructor http://www.gap-system.org/lib?wordrep?Is16BitsAssocWord_st1
+dataconstructor http://www.gap-system.org/lib?wordrep?Is16BitsAssocWord_st2
+dataconstructor http://www.gap-system.org/lib?wordrep?Is16BitsAssocWord_st3
+dataconstructor http://www.gap-system.org/lib?wordrep?Is16BitsAssocWord_st4
+dataconstructor http://www.gap-system.org/lib?wordrep?Is16BitsAssocWord_st5
+dataconstructor http://www.gap-system.org/lib?wordrep?Is16BitsAssocWord_st6
+dataconstructor http://www.gap-system.org/lib?wordrep?Is8BitsAssocWord
+dataconstructor http://www.gap-system.org/lib?wordrep?Is8BitsAssocWord_st0
+dataconstructor http://www.gap-system.org/lib?wordrep?Is8BitsAssocWord_st1
+dataconstructor http://www.gap-system.org/lib?wordrep?Is8BitsAssocWord_st2
+dataconstructor http://www.gap-system.org/lib?wordrep?Is8BitsAssocWord_st3
+dataconstructor http://www.gap-system.org/lib?wordrep?Is8BitsAssocWord_st4
+dataconstructor http://www.gap-system.org/lib?wordrep?Is8BitsAssocWord_st5
+dataconstructor http://www.gap-system.org/lib?wordrep?Is8BitsAssocWord_st6
+dataconstructor http://www.gap-system.org/lib?wordrep?IsInfBitsAssocWord
+dataconstructor http://www.gap-system.org/lib?wordrep?IsInfBitsAssocWord_st0
+dataconstructor http://www.gap-system.org/lib?wordrep?IsInfBitsAssocWord_st1
+dataconstructor http://www.gap-system.org/lib?wordrep?IsInfBitsAssocWord_st2
+dataconstructor http://www.gap-system.org/lib?wordrep?IsInfBitsAssocWord_st3
+dataconstructor http://www.gap-system.org/lib?wordrep?IsInfBitsAssocWord_st4
+dataconstructor http://www.gap-system.org/lib?wordrep?IsInfBitsAssocWord_st5
+dataconstructor http://www.gap-system.org/lib?wordrep?IsInfBitsAssocWord_st6
 theory http://www.gap-system.org/lib?wordrep
 HasMeta http://www.gap-system.org/lib?wordrep http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?wordrep http://www.gap-system.org/lib?type
diff --git a/relational/http..www.gap-system.org/lib/wpobj.rel b/relational/http..www.gap-system.org/lib/wpobj.rel
index 7f7751d44ebed600a1b004cd52736be2261c838c..04d0bd2b348328e1c6b2019aab714c17e4e3f7ba 100644
--- a/relational/http..www.gap-system.org/lib/wpobj.rel
+++ b/relational/http..www.gap-system.org/lib/wpobj.rel
@@ -3,6 +3,13 @@ implies http://www.gap-system.org/lib?wpobj?IsWeakPointerObject_st5 http://www.g
 implies http://www.gap-system.org/lib?wpobj?IsWeakPointerObject_st5 http://www.gap-system.org/lib?coll?IsListOrCollection
 implies http://www.gap-system.org/lib?wpobj?IsWeakPointerObject_st5 http://www.gap-system.org/lib?coll?IsFinite
 implies http://www.gap-system.org/lib?wpobj?IsWeakPointerObject_st5 http://www.gap-system.org/lib?list?IsSmallList
+dataconstructor http://www.gap-system.org/lib?wpobj?IsWeakPointerObject
+dataconstructor http://www.gap-system.org/lib?wpobj?IsWeakPointerObject_st0
+dataconstructor http://www.gap-system.org/lib?wpobj?IsWeakPointerObject_st1
+dataconstructor http://www.gap-system.org/lib?wpobj?IsWeakPointerObject_st2
+dataconstructor http://www.gap-system.org/lib?wpobj?IsWeakPointerObject_st3
+dataconstructor http://www.gap-system.org/lib?wpobj?IsWeakPointerObject_st4
+dataconstructor http://www.gap-system.org/lib?wpobj?IsWeakPointerObject_st5
 theory http://www.gap-system.org/lib?wpobj
 HasMeta http://www.gap-system.org/lib?wpobj http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?wpobj http://www.gap-system.org/lib?list
diff --git a/relational/http..www.gap-system.org/lib/zlattice.rel b/relational/http..www.gap-system.org/lib/zlattice.rel
index 8489c05e2280db78fd5a63f84973ffff786852fd..87326d560281a989d99f55b1c224b2c965f23de0 100644
--- a/relational/http..www.gap-system.org/lib/zlattice.rel
+++ b/relational/http..www.gap-system.org/lib/zlattice.rel
@@ -14,6 +14,8 @@ implies http://www.gap-system.org/lib?zlattice?ScalarProduct http://www.gap-syst
 implies http://www.gap-system.org/lib?zlattice?ScalarProduct http://www.gap-system.org/lib?ctbl?IsCharacterTable
 implies http://www.gap-system.org/lib?zlattice?ScalarProduct http://www.gap-system.org/lib?list?IsHomogeneousList
 implies http://www.gap-system.org/lib?zlattice?ScalarProduct http://www.gap-system.org/lib?arith?IsOddAdditiveNestingDepthObject
+dataconstructor http://www.gap-system.org/lib?zlattice?Decomposition
+dataconstructor http://www.gap-system.org/lib?zlattice?ScalarProduct
 theory http://www.gap-system.org/lib?zlattice
 HasMeta http://www.gap-system.org/lib?zlattice http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?zlattice http://www.gap-system.org/lib?list
diff --git a/relational/http..www.gap-system.org/lib/zmodnz.rel b/relational/http..www.gap-system.org/lib/zmodnz.rel
index 3b972855e92d62909c3ff415b7ef61bece5e365b..49edc32a300ea0db8c71aa23f02d65e1c2d49682 100644
--- a/relational/http..www.gap-system.org/lib/zmodnz.rel
+++ b/relational/http..www.gap-system.org/lib/zmodnz.rel
@@ -46,6 +46,42 @@ implies http://www.gap-system.org/lib?zmodnz?IsModulusRep_st0 http://www.gap-sys
 IsFilter http://www.gap-system.org/lib?zmodnz?IsZmodpZObj
 implies http://www.gap-system.org/lib?zmodnz?IsZmodpZObj http://www.gap-system.org/lib?ffe?IsFFE
 implies http://www.gap-system.org/lib?zmodnz?IsZmodpZObj http://www.gap-system.org/lib?zmodnz?IsZmodnZObj
+dataconstructor http://www.gap-system.org/lib?zmodnz?IsZmodnZObj
+dataconstructor http://www.gap-system.org/lib?zmodnz?IsZmodnZObj_st0
+dataconstructor http://www.gap-system.org/lib?zmodnz?IsZmodnZObj_st1
+dataconstructor http://www.gap-system.org/lib?zmodnz?IsZmodnZObj_st2
+dataconstructor http://www.gap-system.org/lib?zmodnz?IsZmodnZObj_st3
+dataconstructor http://www.gap-system.org/lib?zmodnz?IsZmodnZObj_st4
+dataconstructor http://www.gap-system.org/lib?zmodnz?IsZmodnZObj_st5
+dataconstructor http://www.gap-system.org/lib?zmodnz?IsZmodnZObj_st6
+dataconstructor http://www.gap-system.org/lib?zmodnz?IsZmodnZObj_st7
+dataconstructor http://www.gap-system.org/lib?zmodnz?IsZmodnZObj_st8
+dataconstructor http://www.gap-system.org/lib?zmodnz?IsZmodnZObj_st9
+dataconstructor http://www.gap-system.org/lib?zmodnz?IsZmodnZObj_st10
+dataconstructor http://www.gap-system.org/lib?zmodnz?IsZmodnZObj_st11
+dataconstructor http://www.gap-system.org/lib?zmodnz?IsZmodnZObj_st12
+dataconstructor http://www.gap-system.org/lib?zmodnz?IsZmodpZObjSmall
+dataconstructor http://www.gap-system.org/lib?zmodnz?IsZmodnZObjNonprime
+dataconstructor http://www.gap-system.org/lib?zmodnz?IsZmodnZObjNonprime_st0
+dataconstructor http://www.gap-system.org/lib?zmodnz?IsZmodnZObjNonprime_st1
+dataconstructor http://www.gap-system.org/lib?zmodnz?IsZmodnZObjNonprime_st2
+dataconstructor http://www.gap-system.org/lib?zmodnz?IsZmodnZObjNonprime_st3
+dataconstructor http://www.gap-system.org/lib?zmodnz?IsZmodnZObjNonprime_st4
+dataconstructor http://www.gap-system.org/lib?zmodnz?IsZmodnZObjNonprime_st5
+dataconstructor http://www.gap-system.org/lib?zmodnz?IsZmodnZObjNonprime_st6
+dataconstructor http://www.gap-system.org/lib?zmodnz?IsZmodnZObjNonprime_st7
+dataconstructor http://www.gap-system.org/lib?zmodnz?IsZmodnZObjNonprime_st8
+dataconstructor http://www.gap-system.org/lib?zmodnz?IsZmodnZObjNonprime_st9
+dataconstructor http://www.gap-system.org/lib?zmodnz?IsZmodnZObjNonprime_st10
+dataconstructor http://www.gap-system.org/lib?zmodnz?IsZmodnZObjNonprime_st11
+dataconstructor http://www.gap-system.org/lib?zmodnz?IsZmodnZObjNonprime_st12
+dataconstructor http://www.gap-system.org/lib?zmodnz?IsZmodnZObjNonprime_st13
+dataconstructor http://www.gap-system.org/lib?zmodnz?ZmodnZObj
+dataconstructor http://www.gap-system.org/lib?zmodnz?IsZmodpZObjLarge
+dataconstructor http://www.gap-system.org/lib?zmodnz?ModulusOfZmodnZObj
+dataconstructor http://www.gap-system.org/lib?zmodnz?IsModulusRep
+dataconstructor http://www.gap-system.org/lib?zmodnz?IsModulusRep_st0
+dataconstructor http://www.gap-system.org/lib?zmodnz?IsZmodpZObj
 theory http://www.gap-system.org/lib?zmodnz
 HasMeta http://www.gap-system.org/lib?zmodnz http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?zmodnz http://www.gap-system.org/lib?arith
@@ -78,7 +114,6 @@ constant http://www.gap-system.org/lib?zmodnz?IsZmodnZObj_st11
 Declares http://www.gap-system.org/lib?zmodnz http://www.gap-system.org/lib?zmodnz?IsZmodnZObj_st12
 constant http://www.gap-system.org/lib?zmodnz?IsZmodnZObj_st12
 Includes http://www.gap-system.org/lib?zmodnz http://www.gap-system.org/lib?ffe
-Includes http://www.gap-system.org/lib?zmodnz http://www.gap-system.org/lib?zmodnz
 Declares http://www.gap-system.org/lib?zmodnz http://www.gap-system.org/lib?zmodnz?IsZmodpZObjSmall
 constant http://www.gap-system.org/lib?zmodnz?IsZmodpZObjSmall
 Declares http://www.gap-system.org/lib?zmodnz http://www.gap-system.org/lib?zmodnz?IsZmodnZObjNonprime
diff --git a/relational/http..www.gap-system.org/lib/zmodnze.rel b/relational/http..www.gap-system.org/lib/zmodnze.rel
index ab3c8beb05f5fbf9693c4032fe8d0bec13dfcb2a..d6650ba5649d1da0aa0be458a298b6046bea9e05 100644
--- a/relational/http..www.gap-system.org/lib/zmodnze.rel
+++ b/relational/http..www.gap-system.org/lib/zmodnze.rel
@@ -21,6 +21,21 @@ IsAttribute http://www.gap-system.org/lib?zmodnze?Cyclotomic
 implies http://www.gap-system.org/lib?zmodnze?Cyclotomic http://www.gap-system.org/lib?zmodnze?IsZmodnZepsObj
 IsFilter http://www.gap-system.org/lib?zmodnze?IsZmodnZepsRep
 implies http://www.gap-system.org/lib?zmodnze?IsZmodnZepsRep_st0 http://www.gap-system.org/lib?type?IsPositionalObjectRep
+dataconstructor http://www.gap-system.org/lib?zmodnze?IsRingOfIntegralCyclotomics
+dataconstructor http://www.gap-system.org/lib?zmodnze?IsZmodnZepsObj
+dataconstructor http://www.gap-system.org/lib?zmodnze?IsZmodnZepsObj_st0
+dataconstructor http://www.gap-system.org/lib?zmodnze?IsZmodnZepsObj_st1
+dataconstructor http://www.gap-system.org/lib?zmodnze?IsZmodnZepsObj_st2
+dataconstructor http://www.gap-system.org/lib?zmodnze?IsZmodnZepsObj_st3
+dataconstructor http://www.gap-system.org/lib?zmodnze?IsZmodnZepsObj_st4
+dataconstructor http://www.gap-system.org/lib?zmodnze?IsZmodnZepsObj_st5
+dataconstructor http://www.gap-system.org/lib?zmodnze?IsZmodnZepsObj_st6
+dataconstructor http://www.gap-system.org/lib?zmodnze?IsZmodnZepsObj_st7
+dataconstructor http://www.gap-system.org/lib?zmodnze?IsZmodnZepsObj_st8
+dataconstructor http://www.gap-system.org/lib?zmodnze?IsZmodnZepsObj_st9
+dataconstructor http://www.gap-system.org/lib?zmodnze?Cyclotomic
+dataconstructor http://www.gap-system.org/lib?zmodnze?IsZmodnZepsRep
+dataconstructor http://www.gap-system.org/lib?zmodnze?IsZmodnZepsRep_st0
 theory http://www.gap-system.org/lib?zmodnze
 HasMeta http://www.gap-system.org/lib?zmodnze http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/lib?zmodnze http://www.gap-system.org/lib?magma
@@ -51,7 +66,6 @@ Declares http://www.gap-system.org/lib?zmodnze http://www.gap-system.org/lib?zmo
 constant http://www.gap-system.org/lib?zmodnze?IsZmodnZepsObj_st8
 Declares http://www.gap-system.org/lib?zmodnze http://www.gap-system.org/lib?zmodnze?IsZmodnZepsObj_st9
 constant http://www.gap-system.org/lib?zmodnze?IsZmodnZepsObj_st9
-Includes http://www.gap-system.org/lib?zmodnze http://www.gap-system.org/lib?zmodnze
 Declares http://www.gap-system.org/lib?zmodnze http://www.gap-system.org/lib?zmodnze?Cyclotomic
 constant http://www.gap-system.org/lib?zmodnze?Cyclotomic
 Includes http://www.gap-system.org/lib?zmodnze http://www.gap-system.org/lib?type
diff --git a/relational/http..www.gap-system.org/pkg/GAPDoc-1.5.1/lib/$Print$Util.rel b/relational/http..www.gap-system.org/pkg/GAPDoc-1.5.1/lib/$Print$Util.rel
index 3687344d052522776aba50244129268e029f6c24..8ec9e6eff03a9c6db6123f87e8d7cb5e02081466 100644
--- a/relational/http..www.gap-system.org/pkg/GAPDoc-1.5.1/lib/$Print$Util.rel
+++ b/relational/http..www.gap-system.org/pkg/GAPDoc-1.5.1/lib/$Print$Util.rel
@@ -1,4 +1,5 @@
 IsFilter http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?PrintUtil?IsObjToBePrinted
+dataconstructor http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?PrintUtil?IsObjToBePrinted
 theory http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?PrintUtil
 HasMeta http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?PrintUtil http://www.gap-system.org/?Types
 Declares http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?PrintUtil http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?PrintUtil?IsObjToBePrinted
diff --git a/relational/http..www.gap-system.org/pkg/GAPDoc-1.5.1/lib/$Unicode$Tools.rel b/relational/http..www.gap-system.org/pkg/GAPDoc-1.5.1/lib/$Unicode$Tools.rel
index af1e414498a054779cdae544ea674ad88d60417d..cd64c46bc3a481b72c890b8cce99bcb678333ab7 100644
--- a/relational/http..www.gap-system.org/pkg/GAPDoc-1.5.1/lib/$Unicode$Tools.rel
+++ b/relational/http..www.gap-system.org/pkg/GAPDoc-1.5.1/lib/$Unicode$Tools.rel
@@ -30,6 +30,36 @@ implies http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?UnicodeTools?IsUnicodeCha
 implies http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?UnicodeTools?IsUnicodeCharacter_st18 http://www.gap-system.org/lib?arith?IsCommutativeElement
 implies http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?UnicodeTools?IsUnicodeCharacter_st18 http://www.gap-system.org/lib?string?IsChar
 implies http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?UnicodeTools?IsUnicodeCharacter_st18 http://www.gap-system.org/lib?cyclotom?IsCyclotomic
+dataconstructor http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?UnicodeTools?IsUnicodeString
+dataconstructor http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?UnicodeTools?IsUnicodeString_st0
+dataconstructor http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?UnicodeTools?IsUnicodeString_st1
+dataconstructor http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?UnicodeTools?IsUnicodeString_st2
+dataconstructor http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?UnicodeTools?IsUnicodeString_st3
+dataconstructor http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?UnicodeTools?IsUnicodeString_st4
+dataconstructor http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?UnicodeTools?IsUnicodeString_st5
+dataconstructor http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?UnicodeTools?Unicode
+dataconstructor http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?UnicodeTools?Encode
+dataconstructor http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?UnicodeTools?UChar
+dataconstructor http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?UnicodeTools?IsUnicodeCharacter
+dataconstructor http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?UnicodeTools?IsUnicodeCharacter_st0
+dataconstructor http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?UnicodeTools?IsUnicodeCharacter_st1
+dataconstructor http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?UnicodeTools?IsUnicodeCharacter_st2
+dataconstructor http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?UnicodeTools?IsUnicodeCharacter_st3
+dataconstructor http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?UnicodeTools?IsUnicodeCharacter_st4
+dataconstructor http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?UnicodeTools?IsUnicodeCharacter_st5
+dataconstructor http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?UnicodeTools?IsUnicodeCharacter_st6
+dataconstructor http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?UnicodeTools?IsUnicodeCharacter_st7
+dataconstructor http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?UnicodeTools?IsUnicodeCharacter_st8
+dataconstructor http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?UnicodeTools?IsUnicodeCharacter_st9
+dataconstructor http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?UnicodeTools?IsUnicodeCharacter_st10
+dataconstructor http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?UnicodeTools?IsUnicodeCharacter_st11
+dataconstructor http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?UnicodeTools?IsUnicodeCharacter_st12
+dataconstructor http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?UnicodeTools?IsUnicodeCharacter_st13
+dataconstructor http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?UnicodeTools?IsUnicodeCharacter_st14
+dataconstructor http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?UnicodeTools?IsUnicodeCharacter_st15
+dataconstructor http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?UnicodeTools?IsUnicodeCharacter_st16
+dataconstructor http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?UnicodeTools?IsUnicodeCharacter_st17
+dataconstructor http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?UnicodeTools?IsUnicodeCharacter_st18
 theory http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?UnicodeTools
 HasMeta http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?UnicodeTools http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?UnicodeTools http://www.gap-system.org/lib?list
@@ -51,7 +81,6 @@ Declares http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?UnicodeTools http://www.
 constant http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?UnicodeTools?IsUnicodeString_st5
 Declares http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?UnicodeTools http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?UnicodeTools?Unicode
 constant http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?UnicodeTools?Unicode
-Includes http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?UnicodeTools http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?UnicodeTools
 Declares http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?UnicodeTools http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?UnicodeTools?Encode
 constant http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?UnicodeTools?Encode
 Declares http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?UnicodeTools http://www.gap-system.org/pkg/GAPDoc-1.5.1/lib?UnicodeTools?UChar
diff --git a/relational/http..www.gap-system.org/pkg/io-4.4.4/gap/background.rel b/relational/http..www.gap-system.org/pkg/io-4.4.4/gap/background.rel
index 6dbe109c6d29c7d5f02fa58646e73283911cb0a6..46626c3b148ae224454a51c53a5e76bfc256cbb0 100644
--- a/relational/http..www.gap-system.org/pkg/io-4.4.4/gap/background.rel
+++ b/relational/http..www.gap-system.org/pkg/io-4.4.4/gap/background.rel
@@ -50,6 +50,32 @@ implies http://www.gap-system.org/pkg/io-4.4.4/gap?background?ParListByFork http
 IsAttribute http://www.gap-system.org/pkg/io-4.4.4/gap?background?IsIdle
 implies http://www.gap-system.org/pkg/io-4.4.4/gap?background?IsIdle http://www.gap-system.org/pkg/io-4.4.4/gap?background?IsBackgroundJob
 implies http://www.gap-system.org/pkg/io-4.4.4/gap?background?IsIdle http://www.gap-system.org/pkg/io-4.4.4/gap?background?IsWorkerFarmByFork
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?background?BackgroundJobByFork
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?background?IsWorkerFarm
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?background?IsWorkerFarm_st0
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?background?IsWorkerFarm_st1
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?background?IsWorkerFarmByFork
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?background?IsWorkerFarmByFork_st0
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?background?IsWorkerFarmByFork_st1
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?background?IsWorkerFarmByFork_st2
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?background?DoQueues
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?background?IsBackgroundJob
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?background?IsBackgroundJob_st0
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?background?IsBackgroundJob_st1
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?background?WaitUntilIdle
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?background?Pickup
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?background?ParMapReduceByFork
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?background?Kill
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?background?ParDoByFork
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?background?ParWorkerFarmByFork
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?background?IsBackgroundJobByFork
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?background?IsBackgroundJobByFork_st0
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?background?IsBackgroundJobByFork_st1
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?background?IsBackgroundJobByFork_st2
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?background?ParTakeFirstResultByFork
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?background?Submit
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?background?ParListByFork
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?background?IsIdle
 theory http://www.gap-system.org/pkg/io-4.4.4/gap?background
 HasMeta http://www.gap-system.org/pkg/io-4.4.4/gap?background http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/pkg/io-4.4.4/gap?background http://www.gap-system.org/lib?function
@@ -63,7 +89,6 @@ Declares http://www.gap-system.org/pkg/io-4.4.4/gap?background http://www.gap-sy
 constant http://www.gap-system.org/pkg/io-4.4.4/gap?background?IsWorkerFarm_st0
 Declares http://www.gap-system.org/pkg/io-4.4.4/gap?background http://www.gap-system.org/pkg/io-4.4.4/gap?background?IsWorkerFarm_st1
 constant http://www.gap-system.org/pkg/io-4.4.4/gap?background?IsWorkerFarm_st1
-Includes http://www.gap-system.org/pkg/io-4.4.4/gap?background http://www.gap-system.org/pkg/io-4.4.4/gap?background
 Declares http://www.gap-system.org/pkg/io-4.4.4/gap?background http://www.gap-system.org/pkg/io-4.4.4/gap?background?IsWorkerFarmByFork
 constant http://www.gap-system.org/pkg/io-4.4.4/gap?background?IsWorkerFarmByFork
 Declares http://www.gap-system.org/pkg/io-4.4.4/gap?background http://www.gap-system.org/pkg/io-4.4.4/gap?background?IsWorkerFarmByFork_st0
diff --git a/relational/http..www.gap-system.org/pkg/io-4.4.4/gap/io.rel b/relational/http..www.gap-system.org/pkg/io-4.4.4/gap/io.rel
index ed41087d6f82adbb66dbad833fb4d1a19b3f1bb2..276311014db8b4381ed01ccc4b41cf69675c7f61 100644
--- a/relational/http..www.gap-system.org/pkg/io-4.4.4/gap/io.rel
+++ b/relational/http..www.gap-system.org/pkg/io-4.4.4/gap/io.rel
@@ -3,6 +3,10 @@ implies http://www.gap-system.org/pkg/io-4.4.4/gap?io?IO_Result_st0 http://www.g
 IsFilter http://www.gap-system.org/pkg/io-4.4.4/gap?io?IsFile
 IsAttribute http://www.gap-system.org/pkg/io-4.4.4/gap?io?ProcessID
 implies http://www.gap-system.org/pkg/io-4.4.4/gap?io?ProcessID http://www.gap-system.org/pkg/io-4.4.4/gap?io?IsFile
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?io?IO_Result
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?io?IO_Result_st0
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?io?IsFile
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?io?ProcessID
 theory http://www.gap-system.org/pkg/io-4.4.4/gap?io
 HasMeta http://www.gap-system.org/pkg/io-4.4.4/gap?io http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/pkg/io-4.4.4/gap?io http://www.gap-system.org/lib?type
@@ -12,6 +16,5 @@ Declares http://www.gap-system.org/pkg/io-4.4.4/gap?io http://www.gap-system.org
 constant http://www.gap-system.org/pkg/io-4.4.4/gap?io?IO_Result_st0
 Declares http://www.gap-system.org/pkg/io-4.4.4/gap?io http://www.gap-system.org/pkg/io-4.4.4/gap?io?IsFile
 constant http://www.gap-system.org/pkg/io-4.4.4/gap?io?IsFile
-Includes http://www.gap-system.org/pkg/io-4.4.4/gap?io http://www.gap-system.org/pkg/io-4.4.4/gap?io
 Declares http://www.gap-system.org/pkg/io-4.4.4/gap?io http://www.gap-system.org/pkg/io-4.4.4/gap?io?ProcessID
 constant http://www.gap-system.org/pkg/io-4.4.4/gap?io?ProcessID
diff --git a/relational/http..www.gap-system.org/pkg/io-4.4.4/gap/iohub.rel b/relational/http..www.gap-system.org/pkg/io-4.4.4/gap/iohub.rel
index a2390e468311983cc4ba3cad5597f0e13a24b76f..bebbffc3d1d869d852eeb482a1e24cee168acfba 100644
--- a/relational/http..www.gap-system.org/pkg/io-4.4.4/gap/iohub.rel
+++ b/relational/http..www.gap-system.org/pkg/io-4.4.4/gap/iohub.rel
@@ -47,6 +47,26 @@ implies http://www.gap-system.org/pkg/io-4.4.4/gap?iohub?StoreLenIn8Bytes http:/
 implies http://www.gap-system.org/pkg/io-4.4.4/gap?iohub?StoreLenIn8Bytes http://www.gap-system.org/lib?cyclotom?IsInt
 IsAttribute http://www.gap-system.org/pkg/io-4.4.4/gap?iohub?InputQueue
 implies http://www.gap-system.org/pkg/io-4.4.4/gap?iohub?InputQueue http://www.gap-system.org/pkg/io-4.4.4/gap?iohub?IsIOHub
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?iohub?IOHub
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?iohub?IsIOHubCat
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?iohub?IsIOHubCat_st0
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?iohub?IsIOHub
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?iohub?IsIOHub_st0
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?iohub?IsIOHub_st1
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?iohub?Shutdown
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?iohub?OutputQueue
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?iohub?DoIO
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?iohub?SubmitOutput
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?iohub?GetInput
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?iohub?NewTCPConnection
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?iohub?ShutdownServingSocket
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?iohub?CloseConnection
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?iohub?AttachServingSocket
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?iohub?NewConnection
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?iohub?GetLenFrom8Bytes
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?iohub?AcceptNewConnection
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?iohub?StoreLenIn8Bytes
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?iohub?InputQueue
 theory http://www.gap-system.org/pkg/io-4.4.4/gap?iohub
 HasMeta http://www.gap-system.org/pkg/io-4.4.4/gap?iohub http://www.gap-system.org/?Types
 Declares http://www.gap-system.org/pkg/io-4.4.4/gap?iohub http://www.gap-system.org/pkg/io-4.4.4/gap?iohub?IOHub
@@ -56,7 +76,6 @@ Declares http://www.gap-system.org/pkg/io-4.4.4/gap?iohub http://www.gap-system.
 constant http://www.gap-system.org/pkg/io-4.4.4/gap?iohub?IsIOHubCat
 Declares http://www.gap-system.org/pkg/io-4.4.4/gap?iohub http://www.gap-system.org/pkg/io-4.4.4/gap?iohub?IsIOHubCat_st0
 constant http://www.gap-system.org/pkg/io-4.4.4/gap?iohub?IsIOHubCat_st0
-Includes http://www.gap-system.org/pkg/io-4.4.4/gap?iohub http://www.gap-system.org/pkg/io-4.4.4/gap?iohub
 Declares http://www.gap-system.org/pkg/io-4.4.4/gap?iohub http://www.gap-system.org/pkg/io-4.4.4/gap?iohub?IsIOHub
 constant http://www.gap-system.org/pkg/io-4.4.4/gap?iohub?IsIOHub
 Declares http://www.gap-system.org/pkg/io-4.4.4/gap?iohub http://www.gap-system.org/pkg/io-4.4.4/gap?iohub?IsIOHub_st0
diff --git a/relational/http..www.gap-system.org/pkg/io-4.4.4/gap/pickle.rel b/relational/http..www.gap-system.org/pkg/io-4.4.4/gap/pickle.rel
index b768586e1cf146d82ea56d9770cc367c9510957e..2ce043f9516edeabcd8cc2d1625766c0bd8a8e0b 100644
--- a/relational/http..www.gap-system.org/pkg/io-4.4.4/gap/pickle.rel
+++ b/relational/http..www.gap-system.org/pkg/io-4.4.4/gap/pickle.rel
@@ -3,6 +3,8 @@ implies http://www.gap-system.org/pkg/io-4.4.4/gap?pickle?IO_Unpickle http://www
 implies http://www.gap-system.org/pkg/io-4.4.4/gap?pickle?IO_Unpickle http://www.gap-system.org/lib?string?IsStringRep
 IsAttribute http://www.gap-system.org/pkg/io-4.4.4/gap?pickle?IO_Pickle
 implies http://www.gap-system.org/pkg/io-4.4.4/gap?pickle?IO_Pickle http://www.gap-system.org/pkg/io-4.4.4/gap?io?IsFile
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?pickle?IO_Unpickle
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?pickle?IO_Pickle
 theory http://www.gap-system.org/pkg/io-4.4.4/gap?pickle
 HasMeta http://www.gap-system.org/pkg/io-4.4.4/gap?pickle http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/pkg/io-4.4.4/gap?pickle http://www.gap-system.org/pkg/io-4.4.4/gap?io
diff --git a/relational/http..www.gap-system.org/pkg/io-4.4.4/gap/realrandom.rel b/relational/http..www.gap-system.org/pkg/io-4.4.4/gap/realrandom.rel
index 47edc23476075dea02e1ca63d34d945d2a98959c..7806044e4e142fd2520dbd0067c2640c4e80c318 100644
--- a/relational/http..www.gap-system.org/pkg/io-4.4.4/gap/realrandom.rel
+++ b/relational/http..www.gap-system.org/pkg/io-4.4.4/gap/realrandom.rel
@@ -1,6 +1,9 @@
 IsFilter http://www.gap-system.org/pkg/io-4.4.4/gap?realrandom?IsRealRandomSource
 implies http://www.gap-system.org/pkg/io-4.4.4/gap?realrandom?IsRealRandomSource_st1 http://www.gap-system.org/lib?type?IsComponentObjectRep
 implies http://www.gap-system.org/pkg/io-4.4.4/gap?realrandom?IsRealRandomSource_st1 http://www.gap-system.org/lib?random?IsRandomSource
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?realrandom?IsRealRandomSource
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?realrandom?IsRealRandomSource_st0
+dataconstructor http://www.gap-system.org/pkg/io-4.4.4/gap?realrandom?IsRealRandomSource_st1
 theory http://www.gap-system.org/pkg/io-4.4.4/gap?realrandom
 HasMeta http://www.gap-system.org/pkg/io-4.4.4/gap?realrandom http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/pkg/io-4.4.4/gap?realrandom http://www.gap-system.org/lib?type
diff --git a/relational/http..www.gap-system.org/pkg/json/gap/json.rel b/relational/http..www.gap-system.org/pkg/json/gap/json.rel
index 7647563cbf9c3ca8494f249c85c711bc9d876a99..31dab909275846e020ed49573c464723709af550 100644
--- a/relational/http..www.gap-system.org/pkg/json/gap/json.rel
+++ b/relational/http..www.gap-system.org/pkg/json/gap/json.rel
@@ -1,5 +1,6 @@
 IsAttribute http://www.gap-system.org/pkg/json/gap?json?_GapToJsonStreamInternal
 implies http://www.gap-system.org/pkg/json/gap?json?_GapToJsonStreamInternal http://www.gap-system.org/lib?streams?IsOutputStream
+dataconstructor http://www.gap-system.org/pkg/json/gap?json?_GapToJsonStreamInternal
 theory http://www.gap-system.org/pkg/json/gap?json
 HasMeta http://www.gap-system.org/pkg/json/gap?json http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/pkg/json/gap?json http://www.gap-system.org/lib?streams
diff --git a/relational/http..www.gap-system.org/prim/irredsol.rel b/relational/http..www.gap-system.org/prim/irredsol.rel
index c5a13df63d1f00e789e1127b954b03baf88859a6..620f9aa0584876cf3d05785bc34d747c50dfd5b1 100644
--- a/relational/http..www.gap-system.org/prim/irredsol.rel
+++ b/relational/http..www.gap-system.org/prim/irredsol.rel
@@ -10,6 +10,8 @@ implies http://www.gap-system.org/prim?irredsol?IsPrimitiveMatrixGroup http://ww
 implies http://www.gap-system.org/prim?irredsol?IsPrimitiveMatrixGroup http://www.gap-system.org/lib?arith?IsMultiplicativeElement
 implies http://www.gap-system.org/prim?irredsol?IsPrimitiveMatrixGroup http://www.gap-system.org/lib?magma?IsMagmaWithInverses
 implies http://www.gap-system.org/prim?irredsol?IsPrimitiveMatrixGroup http://www.gap-system.org/lib?magma?IsAssociative
+dataconstructor http://www.gap-system.org/prim?irredsol?MinimalBlockDimension
+dataconstructor http://www.gap-system.org/prim?irredsol?IsPrimitiveMatrixGroup
 theory http://www.gap-system.org/prim?irredsol
 HasMeta http://www.gap-system.org/prim?irredsol http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/prim?irredsol http://www.gap-system.org/lib?arith
diff --git a/relational/http..www.gap-system.org/prim/primitiv.rel b/relational/http..www.gap-system.org/prim/primitiv.rel
index 8bb44a07e88f99db33c1cd3e7a5f2571ac5c2269..12dd38acf774bfe62084e82c2c4056cd77fcccc6 100644
--- a/relational/http..www.gap-system.org/prim/primitiv.rel
+++ b/relational/http..www.gap-system.org/prim/primitiv.rel
@@ -4,6 +4,9 @@ IsAttribute http://www.gap-system.org/prim?primitiv?SimsNo
 implies http://www.gap-system.org/prim?primitiv?SimsNo http://www.gap-system.org/lib?permutat?IsPerm
 implies http://www.gap-system.org/prim?primitiv?SimsNo http://www.gap-system.org/lib?magma?IsMagmaWithInverses
 implies http://www.gap-system.org/prim?primitiv?SimsNo http://www.gap-system.org/lib?magma?IsAssociative
+dataconstructor http://www.gap-system.org/prim?primitiv?IsPrimGrpIterRep
+dataconstructor http://www.gap-system.org/prim?primitiv?IsPrimGrpIterRep_st0
+dataconstructor http://www.gap-system.org/prim?primitiv?SimsNo
 theory http://www.gap-system.org/prim?primitiv
 HasMeta http://www.gap-system.org/prim?primitiv http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/prim?primitiv http://www.gap-system.org/lib?type
diff --git a/relational/http..www.gap-system.org/small/small.rel b/relational/http..www.gap-system.org/small/small.rel
index 38d87029c243bfcc60b52cce90f2dd038fb04b8c..e8faba717fc9b567c3a086da9503387881599737 100644
--- a/relational/http..www.gap-system.org/small/small.rel
+++ b/relational/http..www.gap-system.org/small/small.rel
@@ -10,6 +10,10 @@ implies http://www.gap-system.org/small?small?FrattinifactorSize http://www.gap-
 IsAttribute http://www.gap-system.org/small?small?FrattinifactorId
 implies http://www.gap-system.org/small?small?FrattinifactorId http://www.gap-system.org/lib?magma?IsMagmaWithInverses
 implies http://www.gap-system.org/small?small?FrattinifactorId http://www.gap-system.org/lib?magma?IsAssociative
+dataconstructor http://www.gap-system.org/small?small?Gap3CatalogueIdGroup
+dataconstructor http://www.gap-system.org/small?small?IdGroup
+dataconstructor http://www.gap-system.org/small?small?FrattinifactorSize
+dataconstructor http://www.gap-system.org/small?small?FrattinifactorId
 theory http://www.gap-system.org/small?small
 HasMeta http://www.gap-system.org/small?small http://www.gap-system.org/?Types
 Includes http://www.gap-system.org/small?small http://www.gap-system.org/lib?magma
diff --git a/relational/types.rel b/relational/types.rel
index 3f561fbd86f94e8a9aa89e3661910e40a755828f..9af1a490ece45fedb1f83f789ad3f0b3c23ab33b 100644
--- a/relational/types.rel
+++ b/relational/types.rel
@@ -1,2 +1,2 @@
 document http://www.gap-system.org/types.omdoc
-Declares http://www.gap-system.org/types.omdoc http://www.gap-system.org/?Types
+Declares http://www.gap-system.org/types.omdoc http://www.gap-system.org?Types
diff --git a/source/alignment.mmt b/source/alignment.mmt
index b24dc3c662018a04b95a7bc1b6204c49104810ee..b444533d2a7e955e9362dc4f3392f38bb8cf3faf 100644
--- a/source/alignment.mmt
+++ b/source/alignment.mmt
@@ -1 +1 @@
-namespace http://www.gap-system.org j
\ No newline at end of file
+namespace http://www.gap-system.org ❚
\ No newline at end of file
diff --git a/source/types.mmt b/source/types.mmt
index 0ffc79a1e4f800355368b2407a1fce9e1b9629c4..55c1120c3320839001a48a44d0bd1cf4c8443f91 100644
--- a/source/types.mmt
+++ b/source/types.mmt
@@ -5,14 +5,18 @@ theory Types : ur:?PLF =
 	object : type ❙
 	category : type ❙
 	
+	booleans : type ❙
+	integers : type ❙
+	floats : type ❙
+	
 	filter = object ⟶ type ❙
 	
-	constant # : object ⟶ filter ⟶ type ❘ //  = [o][f] f o ❘ # 1 # 2 ❙
+	hastp : object ⟶ filter ⟶ type ❘ //  = [o][f] f o ❘ # 1 $ 2 ❙
 	
 	filter_and : filter ⟶ filter ⟶ filter ❘ # 1 and 2 ❙
-	filter_and_hasFilter1 : {x,f : filter,g : filter} x # f ⟶ x # g ⟶ x # (f and g) ❙
-	filter_and_hasFilter2 : {x,f : filter,g : filter} x # (f and g) ⟶ x # f ❙
-	filter_and_hasFilter3 : {x,f : filter,g : filter} x # (f and g) ⟶ x # g ❙
+	filter_and_hasFilter1 : {x : object,f : filter,g : filter} x $ f ⟶ x $ g ⟶ x $ (f and g) ❙
+	filter_and_hasFilter2 : {x : object,f : filter,g : filter} x $ (f and g) ⟶ x $ f ❙
+	filter_and_hasFilter3 : {x : object,f : filter,g : filter} x $ (f and g) ⟶ x $ g ❙
 	
 	ded : object ⟶ type ❙
 	
@@ -20,9 +24,6 @@ theory Types : ur:?PLF =
 	rule rules?Integers ❙
 	rule rules?Floats ❙
 	
-	booleans : type ❙
-	integers : type ❙
-	floats : type ❙
 	gapbool : booleans ⟶ object ❙
 	gapint : integers ⟶ object ❙
 	gapfloat : floats ⟶ object ❙