diff --git a/examples/omwg/total-owlable.xml b/examples/omwg/total-owlable.xml
index 0037fee035f16342e42dd425030aaff1ee8f4967..d3784e6bdeb215e17bbfd3c73c43f4fdb487c1e9 100644
--- a/examples/omwg/total-owlable.xml
+++ b/examples/omwg/total-owlable.xml
@@ -5,7 +5,6 @@
 <!ENTITY vin "http://ontology.deri.org/vin#">
 <!ENTITY proton "http://proton.semanticweb.org/">
 <!ENTITY edoal "http://ns.inria.org/edoal/1.0/#">
-<!ENTITY fn "http://www.w3.org/2005/xpath-functions">
 ]>
 
 <rdf:RDF xmlns="http://knowledgeweb.semanticweb.org/heterogeneity/alignment#" 
@@ -325,7 +324,7 @@
       <Cell rdf:about="MappingRule_prop_rest">
 	<entity1>
 	  <edoal:PropertyValueRestriction> 
-	    <edoal:comparator rdf:resource="http://www.w3.org/2001/XMLSchema#equals"/>
+	    <edoal:comparator rdf:resource="&edoal;equals"/>
   	    <edoal:value><edoal:Literal edoal:string="Bordeaux"/></edoal:value>
 	  </edoal:PropertyValueRestriction>
 	</entity1>
@@ -417,7 +416,7 @@
 	      <edoal:Property><edoal:compose rdf:parseType="Collection"/></edoal:Property>
 	    </edoal:entity1>
 	    <edoal:entity2>
-	      <edoal:Apply edoal:operator="&fn;concat">
+	      <edoal:Apply edoal:operator="&edoal;concat">
 		<edoal:arguments rdf:parseType="Collection">
 		  <edoal:Property rdf:about="vcard:firstname"/>
 		  <edoal:Literal edoal:string=" "/>
diff --git a/examples/omwg/total.xml b/examples/omwg/total.xml
index 50af29c5aef828eb6f4152b35a59b640cd0e04bb..30f0520ce829c3f7cdb63de4ccd214c063a5040b 100644
--- a/examples/omwg/total.xml
+++ b/examples/omwg/total.xml
@@ -5,7 +5,6 @@
 <!ENTITY vin "http://ontology.deri.org/vin#">
 <!ENTITY proton "http://proton.semanticweb.org/">
 <!ENTITY edoal "http://ns.inria.org/edoal/1.0/#">
-<!ENTITY fn "http://www.w3.org/2005/xpath-functions">
 ]>
 
 <!-- JE2010: With the "#" in the end, this is parsed (by the RDF parser...)
@@ -594,7 +593,7 @@
   		<edoal:datatype><edoal:Datatype rdf:about="&edoal;MyTypett"/></edoal:datatype>
 	      </edoal:PropertyTypeRestriction>
 	      <edoal:PropertyValueRestriction> 
-		<edoal:comparator rdf:resource="http://www.w3.org/2001/XMLSchema#equals"/>
+		<edoal:comparator rdf:resource="&edoal;equals"/>
   		<edoal:value><edoal:Literal edoal:string="Bordeaux"/></edoal:value>
 	      </edoal:PropertyValueRestriction>
 	    </edoal:or>
@@ -615,7 +614,7 @@
 	      </edoal:PropertyDomainRestriction>
 	      <!-- not fixed -->
 	      <edoal:PropertyValueRestriction> 
-		<edoal:comparator rdf:resource="http://www.w3.org/2001/XMLSchema#equals"/>
+		<edoal:comparator rdf:resource="&edoal;equals"/>
   		<edoal:value><edoal:Apply edoal:operator="http://example.org/gensym"/></edoal:value>
 	      </edoal:PropertyValueRestriction>
 	    </edoal:and>
@@ -714,7 +713,7 @@
 	      <edoal:Property><edoal:compose rdf:parseType="Collection"/></edoal:Property>
 	    </edoal:entity1>
 	    <edoal:entity2>
-	      <edoal:Apply edoal:operator="&fn;concat">
+	      <edoal:Apply edoal:operator="&edoal;concat">
 		<edoal:arguments rdf:parseType="Collection">
 		  <edoal:Property rdf:about="vcard:firstname"/>
 		  <edoal:Literal edoal:type="&xsd;string" edoal:string=" "/>