diff --git a/examples/omwg/total-owlable.xml b/examples/omwg/total-owlable.xml
index c9383b4eee929e2a33016d0c94e00adfc01dc598..3f902f6cfb0a0195975efcb0eafc910f290b6162 100644
--- a/examples/omwg/total-owlable.xml
+++ b/examples/omwg/total-owlable.xml
@@ -5,6 +5,8 @@
 <!ENTITY vin "http://ontology.deri.org/vin#">
 <!ENTITY proton "http://proton.semanticweb.org/">
 <!ENTITY edoal "http://ns.inria.org/edoal/1.0/#">
+<!ENTITY foaf "http://xmlns.com/foaf/">
+<!ENTITY vcard "http://www.w3.org/2006/vcard/ns#">
 ]>
 
 <rdf:RDF xmlns="http://knowledgeweb.semanticweb.org/heterogeneity/alignment#" 
@@ -401,10 +403,10 @@
     <map>
       <Cell rdf:about="TransformationTest">
 	<entity1>
-	  <edoal:Property rdf:about="foaf:name"/>
+	  <edoal:Property rdf:about="&foaf;name"/>
 	</entity1>
 	<entity2>
-	  <edoal:Relation rdf:about="vcard:name"/>
+	  <edoal:Relation rdf:about="&vcard;name"/>
 	</entity2>
         <measure rdf:datatype='&xsd;float'>1.</measure>
         <relation>SubsumedBy</relation>
@@ -416,12 +418,12 @@
 	    <edoal:entity2>
 	      <edoal:Apply edoal:operator="&edoal;concat">
 		<edoal:arguments rdf:parseType="Collection">
-		  <edoal:Property rdf:about="vcard:firstname"/>
+		  <edoal:Property rdf:about="&vcard;firstname"/>
 		  <edoal:Literal edoal:string=" "/>
 		  <!-- or even compute middle initial from middlename -->
-		  <edoal:Property rdf:about="vcard:middleinitial"/>
+		  <edoal:Property rdf:about="&vcard;middleinitial"/>
 		  <edoal:Literal edoal:string=". "/>
-		  <edoal:Property rdf:about="vcard:lastname"/>
+		  <edoal:Property rdf:about="&vcard;lastname"/>
 		</edoal:arguments>
 	      </edoal:Apply>
 	    </edoal:entity2>
diff --git a/examples/omwg/total.xml b/examples/omwg/total.xml
index ae9d22446c870b2c1ca0167d3320026f9f3b615a..2b57248d2acd441d32d85bedb14be9ea5a282375 100644
--- a/examples/omwg/total.xml
+++ b/examples/omwg/total.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <!DOCTYPE rdf:RDF [
 <!ENTITY xsd "http://www.w3.org/2001/XMLSchema#">
+<!ENTITY edoal "http://ns.inria.org/edoal/1.0/#">
 <!ENTITY wine "http://www.w3.org/TR/2003/CR-owl-guide-20030818/wine#">
 <!ENTITY vin "http://ontology.deri.org/vin#">
 <!ENTITY proton "http://proton.semanticweb.org/">
-<!ENTITY edoal "http://ns.inria.org/edoal/1.0/#">
+<!ENTITY foaf "http://xmlns.com/foaf/">
+<!ENTITY vcard "http://www.w3.org/2006/vcard/ns#">
 ]>
 
 <!-- JE2010: With the "#" in the end, this is parsed (by the RDF parser...)
@@ -747,10 +749,10 @@ without it, this is not! -->
         <map>
             <Cell rdf:about="TransformationTest">
                 <entity1>
-                    <edoal:Property rdf:about="foaf:name"/>
+                    <edoal:Property rdf:about="&foaf;name"/>
                 </entity1>
                 <entity2>
-                    <edoal:Relation rdf:about="vcard:name"/>
+                    <edoal:Relation rdf:about="&vcard;name"/>
                 </entity2>
                 <measure rdf:datatype='&xsd;float'>1.</measure>
                 <relation>SubsumedBy</relation>
@@ -764,12 +766,12 @@ without it, this is not! -->
                         <edoal:entity2>
                             <edoal:Apply edoal:operator="&edoal;concat">
                                 <edoal:arguments rdf:parseType="Collection">
-                                    <edoal:Property rdf:about="vcard:firstname"/>
+                                    <edoal:Property rdf:about="&vcard;firstname"/>
                                     <edoal:Literal edoal:type="&xsd;string" edoal:string=" "/>
                                     <!-- or even compute middle initial from middlename -->
-                                    <edoal:Property rdf:about="vcard:middleinitial"/>
+                                    <edoal:Property rdf:about="&vcard;middleinitial"/>
                                     <edoal:Literal edoal:string=". "/>
-                                    <edoal:Property rdf:about="vcard:lastname"/>
+                                    <edoal:Property rdf:about="&vcard;lastname"/>
                                 </edoal:arguments>
                             </edoal:Apply>
                         </edoal:entity2>
diff --git a/test/src/EDOALExportTest.java b/test/src/EDOALExportTest.java
index 60e4b237c787f5af327696790926e76444c46c9f..503158125b72c0d8478da96de02e2a98f4e74c58 100644
--- a/test/src/EDOALExportTest.java
+++ b/test/src/EDOALExportTest.java
@@ -170,7 +170,7 @@ public class EDOALExportTest {
         writer.close();
         String str1 = stream.toString();
         //System.err.println(str1);
-        assertEquals(str1.length(), 11845);
+        assertEquals(str1.length(), 11888);
     }
 
     // Use an alignment converted from URI
@@ -214,7 +214,7 @@ public class EDOALExportTest {
         writer.close();
         String str1 = stream.toString();
         //System.err.println(str1);
-        assertEquals(str1.length(), 37286);
+        assertEquals(str1.length(), 37407);
     }
 
     @Test(groups = {"full", "omwg", "raw"}, dependsOnMethods = {"setUp"})