diff --git a/elements/12energie/eaux/cuivre/codo15.elmt b/elements/12energie/eaux/cuivre/codo15.elmt
index 288f88502..75712ed43 100644
--- a/elements/12energie/eaux/cuivre/codo15.elmt
+++ b/elements/12energie/eaux/cuivre/codo15.elmt
@@ -1,7 +1,9 @@
-<definition width="50" version="0.4" hotspot_x="16" hotspot_y="20" height="50" type="element" ic="true" orientation="dyyy">
+<definition width="50" version="0.4" hotspot_x="16" hotspot_y="20" height="50" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
-        <name lang="es">Codo cobre 15</name>
+        <name lang="en">Copper Elbow 15</name>
         <name lang="it">gomito di rame 15</name>
+        <name lang="fr">Cuivre Coude 15</name>
+        <name lang="es">Codo cobre 15</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
@@ -10,8 +12,8 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <rect width="13" x="4" y="-6.47198" antialias="false" height="6.8393" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <arc width="10.5" x="-4.5" y="-5.00641" antialias="true" height="10.7475" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
         <arc width="29" x="-14" y="-14.2883" antialias="true" height="29.3113" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <input x="5" y="17" size="4" rotate="true" text="codo15"/>
-        <terminal x="-7" y="10.1377" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="10.5" y="-6.9605" nameHidden="1" number="" name="" orientation="n"/>
+        <input x="5" y="17" size="4" rotate="true" text="codo15" tagg="none"/>
+        <terminal x="-7" y="10.1377" orientation="w"/>
+        <terminal x="10.5" y="-6.9605" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/cuivre/codo18.elmt b/elements/12energie/eaux/cuivre/codo18.elmt
index ed3d0570e..f790be40c 100644
--- a/elements/12energie/eaux/cuivre/codo18.elmt
+++ b/elements/12energie/eaux/cuivre/codo18.elmt
@@ -1,7 +1,9 @@
-<definition width="60" version="0.4" hotspot_x="26" hotspot_y="23" height="50" type="element" ic="true" orientation="dyyy">
+<definition width="60" version="0.4" hotspot_x="26" hotspot_y="23" height="50" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
-        <name lang="es">Codo cobre 18</name>
+        <name lang="en">Copper Elbow 18</name>
         <name lang="it">Gomito rame 18</name>
+        <name lang="fr">Cuivre coude 18</name>
+        <name lang="es">Codo cobre 18</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
@@ -10,8 +12,8 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <rect width="15" x="-1" y="-8.95006" antialias="false" height="6.70602" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <arc width="10.5" x="-9.5" y="-7.51306" antialias="true" height="10.538" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
         <arc width="32" x="-20" y="-17.5721" antialias="true" height="30.6561" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <input x="2" y="14" size="4" rotate="true" text="codo18"/>
-        <terminal x="-11" y="8.29398" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="6.5" y="-8.47106" nameHidden="1" number="" name="" orientation="n"/>
+        <input x="2" y="14" size="4" rotate="true" text="codo18" tagg="none"/>
+        <terminal x="-11" y="8.29398" orientation="w"/>
+        <terminal x="6.5" y="-8.47106" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/cuivre/codo22.elmt b/elements/12energie/eaux/cuivre/codo22.elmt
index c2150a1ab..f7b9d9e1f 100644
--- a/elements/12energie/eaux/cuivre/codo22.elmt
+++ b/elements/12energie/eaux/cuivre/codo22.elmt
@@ -1,7 +1,9 @@
-<definition width="50" version="0.4" hotspot_x="24" hotspot_y="25" height="50" type="element" ic="true" orientation="dyyy">
+<definition width="50" version="0.4" hotspot_x="24" hotspot_y="25" height="50" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
-        <name lang="es">Codo cobre 22</name>
+        <name lang="en">Copper Elbow 22</name>
         <name lang="it">Gomito rame 22</name>
+        <name lang="fr">Cuivre coude 22</name>
+        <name lang="es">Codo cobre 22</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
@@ -10,8 +12,8 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <rect width="14" x="-1.4" y="-9.0555" antialias="false" height="5.32374" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <arc width="12" x="-11.4" y="-9.0555" antialias="true" height="11.0277" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
         <arc width="32" x="-21" y="-18.5622" antialias="true" height="30.4214" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <input x="-3" y="12" size="4" rotate="true" text="codo22"/>
-        <terminal x="-9.4" y="5.77492" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="4.6" y="-7.53443" nameHidden="1" number="" name="" orientation="n"/>
+        <input x="-3" y="12" size="4" rotate="true" text="codo22" tagg="none"/>
+        <terminal x="-9.4" y="5.77492" orientation="w"/>
+        <terminal x="4.6" y="-7.53443" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/cuivre/latiguillo1_2.elmt b/elements/12energie/eaux/cuivre/latiguillo1_2.elmt
index dc947a828..97e45bd4c 100644
--- a/elements/12energie/eaux/cuivre/latiguillo1_2.elmt
+++ b/elements/12energie/eaux/cuivre/latiguillo1_2.elmt
@@ -1,7 +1,9 @@
-<definition width="50" version="0.4" hotspot_x="24" hotspot_y="27" height="60" type="element" ic="true" orientation="dyyy">
+<definition width="50" version="0.4" hotspot_x="24" hotspot_y="27" height="60" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
-        <name lang="es">Rácor 15-1/2</name>
+        <name lang="en">Fitting 15-1/2</name>
         <name lang="it">Raccordo 15-1/2</name>
+        <name lang="fr">Raccord 15-1/2</name>
+        <name lang="es">Rácor 15-1/2</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
@@ -13,10 +15,10 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <arc width="8" x="-8" y="-23" antialias="true" height="14" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="9" x1="-16.0738" y2="9" x2="-4.92003"/>
         <arc width="7" x="-7" y="-9" antialias="true" height="18" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <input x="-22" y="21" size="4" rotate="true" text="rácor 15-1/2"/>
+        <input x="-22" y="21" size="4" rotate="true" text="rácor 15-1/2" tagg="none"/>
         <rect width="12" x="10" y="-9" antialias="false" height="18" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <rect width="8" x="14" y="-7" antialias="false" height="14" style="line-style:dashed;line-weight:thin;filling:none;color:black"/>
-        <terminal x="-17" y="0" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="21" y="0" nameHidden="1" number="" name="" orientation="e"/>
+        <terminal x="-17" y="0" orientation="w"/>
+        <terminal x="21" y="0" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/cuivre/manguito-15-22.elmt b/elements/12energie/eaux/cuivre/manguito-15-22.elmt
index 1d2ee5665..89ee9fe53 100644
--- a/elements/12energie/eaux/cuivre/manguito-15-22.elmt
+++ b/elements/12energie/eaux/cuivre/manguito-15-22.elmt
@@ -1,5 +1,7 @@
-<definition width="40" version="0.4" hotspot_x="15" hotspot_y="18" height="30" type="element" ic="true" orientation="dyyy">
+<definition width="40" version="0.4" hotspot_x="15" hotspot_y="18" height="30" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="en">Copper Hose 15-22</name>
+        <name lang="fr">Cuivre Tuyau 15-22</name>
         <name lang="es">Manguito cobre 15-22</name>
     </names>
     <informations></informations>
@@ -13,7 +15,7 @@
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="0" y2="-5" x2="1"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="1" y2="-8" x2="8"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="1" y2="8" x2="8"/>
-        <terminal x="-10" y="0" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="19" y="0" nameHidden="0" number="" name="" orientation="e"/>
+        <terminal x="-10" y="0" orientation="w"/>
+        <terminal x="19" y="0" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/cuivre/manguito-18-22.elmt b/elements/12energie/eaux/cuivre/manguito-18-22.elmt
index b6bf15f47..c3a9400cd 100644
--- a/elements/12energie/eaux/cuivre/manguito-18-22.elmt
+++ b/elements/12energie/eaux/cuivre/manguito-18-22.elmt
@@ -1,5 +1,7 @@
-<definition width="40" version="0.4" hotspot_x="15" hotspot_y="17" height="30" type="element" ic="true" orientation="dyyy">
+<definition width="40" version="0.4" hotspot_x="15" hotspot_y="17" height="30" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="en">Copper Hose 18-22</name>
+        <name lang="fr">Cuivre Tuyau 18-22</name>
         <name lang="es">Manguito cobre 18-22</name>
     </names>
     <informations></informations>
@@ -13,7 +15,7 @@
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="0" y2="-5" x2="1"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="1" y2="-7" x2="9"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="1" y2="8" x2="9"/>
-        <terminal x="-10" y="0" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="19" y="0" nameHidden="0" number="" name="" orientation="e"/>
+        <terminal x="-10" y="0" orientation="w"/>
+        <terminal x="19" y="0" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/cuivre/manguito-codo1_2h-15.elmt b/elements/12energie/eaux/cuivre/manguito-codo1_2h-15.elmt
index 676c81e98..5fb3ff494 100644
--- a/elements/12energie/eaux/cuivre/manguito-codo1_2h-15.elmt
+++ b/elements/12energie/eaux/cuivre/manguito-codo1_2h-15.elmt
@@ -1,5 +1,7 @@
-<definition width="50" version="0.4" hotspot_x="24" hotspot_y="18" height="50" type="element" ic="true" orientation="dyyy">
+<definition width="50" version="0.4" hotspot_x="22" hotspot_y="18" height="50" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="en">Elbow-sleeve 1/2 "H-15</name>
+        <name lang="fr">Coude-douille de 1/2 "H-15</name>
         <name lang="es">Manguito-Codo 1/2"H-15</name>
     </names>
     <informations>Rafael Ferrando.
@@ -16,8 +18,8 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-7.31731" x1="-1.99" y2="-8.30353" x2="9.35"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-6.33109" x1="-1.99" y2="-7.31731" x2="9.35"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-5.34487" x1="-1.99" y2="-6.33109" x2="9.35"/>
-        <input x="-20" y="20" size="4" rotate="true" text="manguito aco- &#xa;dado1/2H-15"/>
-        <terminal x="-12.7" y="8.20639" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="3.68" y="-10.075" nameHidden="1" number="" name="" orientation="n"/>
+        <input x="-20" y="20" size="4" rotate="true" text="manguito aco- &#xa;dado1/2H-15" tagg="none"/>
+        <terminal x="-12.7" y="8.20639" orientation="w"/>
+        <terminal x="3.68" y="-10.075" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/cuivre/manguito-placa1_2-15.elmt b/elements/12energie/eaux/cuivre/manguito-placa1_2-15.elmt
index dec9c50e1..7e13413d7 100644
--- a/elements/12energie/eaux/cuivre/manguito-placa1_2-15.elmt
+++ b/elements/12energie/eaux/cuivre/manguito-placa1_2-15.elmt
@@ -1,5 +1,7 @@
-<definition width="50" version="0.4" hotspot_x="23" hotspot_y="21" height="60" type="element" ic="true" orientation="dyyy">
+<definition width="50" version="0.4" hotspot_x="22" hotspot_y="21" height="60" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="en">Elbow-sleeve 1/2 "H-15</name>
+        <name lang="fr">Coude-douille de 1/2 "H-15</name>
         <name lang="es">Manguito-Codo 1/2"H-15</name>
     </names>
     <informations>Rafael Ferrando.
@@ -17,12 +19,12 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-7.31731" x1="-1.99" y2="-8.30353" x2="9.35"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-6.33109" x1="-1.99" y2="-7.31731" x2="9.35"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-5.34487" x1="-1.99" y2="-6.33109" x2="9.35"/>
-        <input x="-20" y="23.9561" size="4" rotate="true" text="manguito placa&#xa; 1/2H-15"/>
+        <input x="-20" y="23.9561" size="4" rotate="true" text="manguito placa&#xa; 1/2H-15" tagg="none"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="14" x1="-4.76112" y2="14" x2="15.7412"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="14" x1="16" y2="10" x2="16"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="15.268" y2="10" x2="-0.324327"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="8" y2="13" x2="8"/>
-        <terminal x="-15" y="8" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="3.68" y="-10.075" nameHidden="1" number="" name="" orientation="n"/>
+        <terminal x="-15" y="8" orientation="w"/>
+        <terminal x="3.68" y="-10.075" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/cuivre/manguito15-18.elmt b/elements/12energie/eaux/cuivre/manguito15-18.elmt
index 269ad0ed0..d8d24f305 100644
--- a/elements/12energie/eaux/cuivre/manguito15-18.elmt
+++ b/elements/12energie/eaux/cuivre/manguito15-18.elmt
@@ -1,5 +1,7 @@
-<definition width="40" version="0.4" hotspot_x="15" hotspot_y="18" height="30" type="element" ic="true" orientation="dyyy">
+<definition width="40" version="0.4" hotspot_x="15" hotspot_y="18" height="30" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="en">Copper Hose 15-18</name>
+        <name lang="fr">Cuivre Tuyau 15-18</name>
         <name lang="es">Manguito cobre 15-18</name>
     </names>
     <informations></informations>
@@ -13,7 +15,7 @@
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="0" y2="-5" x2="1"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="1" y2="-6" x2="8"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="1" y2="6" x2="8"/>
-        <terminal x="-10" y="0" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="19" y="0" nameHidden="0" number="" name="" orientation="e"/>
+        <terminal x="-10" y="0" orientation="w"/>
+        <terminal x="19" y="0" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/cuivre/manguito15-1_2hembra.elmt b/elements/12energie/eaux/cuivre/manguito15-1_2hembra.elmt
index b99524a15..47cde4ccc 100644
--- a/elements/12energie/eaux/cuivre/manguito15-1_2hembra.elmt
+++ b/elements/12energie/eaux/cuivre/manguito15-1_2hembra.elmt
@@ -1,5 +1,7 @@
-<definition width="40" version="0.4" hotspot_x="21" hotspot_y="27" height="40" type="element" ic="true" orientation="dyyy">
+<definition width="40" version="0.4" hotspot_x="21" hotspot_y="27" height="40" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="en">Sleeve 15 1/2 Female</name>
+        <name lang="fr">Manchon 15 1/2 Femelle</name>
         <name lang="es">Manguito 15 1/2 Hembra</name>
     </names>
     <informations></informations>
@@ -19,8 +21,8 @@
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-8.18757" x1="-2.19" y2="-6.95989" x2="-0.405"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="9" x1="-2.19" y2="7.15847" x2="-0.405"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3.89068" x1="-0.405" y2="3.47542" x2="-0.405"/>
-        <input x="-16" y="-16" size="4" rotate="true" text="1/2&quot;H-15"/>
-        <terminal x="-12.9" y="-0.207628" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="12.09" y="-0.207628" nameHidden="0" number="" name="" orientation="e"/>
+        <input x="-16" y="-16" size="4" rotate="true" text="1/2&quot;H-15" tagg="none"/>
+        <terminal x="-12.9" y="-0.207628" orientation="w"/>
+        <terminal x="12.09" y="-0.207628" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/cuivre/manguito15-1_2macho.elmt b/elements/12energie/eaux/cuivre/manguito15-1_2macho.elmt
index a25f7da83..9487937f4 100644
--- a/elements/12energie/eaux/cuivre/manguito15-1_2macho.elmt
+++ b/elements/12energie/eaux/cuivre/manguito15-1_2macho.elmt
@@ -1,5 +1,7 @@
-<definition width="40" version="0.4" hotspot_x="19" hotspot_y="27" height="40" type="element" ic="true" orientation="dyyy">
+<definition width="40" version="0.4" hotspot_x="18" hotspot_y="27" height="40" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="en">Sleeve 15 1/2 Male</name>
+        <name lang="fr">Manchon 15 1/2 Male</name>
         <name lang="es">Manguito 15 1/2 Macho</name>
     </names>
     <informations></informations>
@@ -16,8 +18,8 @@
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7" x1="10.5" y2="-7.13744" x2="10.5"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7" x1="2.44147" y2="7" x2="10.5634"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4.64376" x1="-0.5" y2="7" x2="2"/>
-        <input x="-12" y="-13" size="4" rotate="true" text="1/2M-15"/>
-        <terminal x="-11" y="-0.0687212" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="10.5" y="-0.0687212" nameHidden="0" number="" name="" orientation="e"/>
+        <input x="-12" y="-13" size="4" rotate="true" text="1/2M-15" tagg="none"/>
+        <terminal x="-11" y="-0.0687212" orientation="w"/>
+        <terminal x="10.5" y="-0.0687212" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/cuivre/manguito18-1_2hembra.elmt b/elements/12energie/eaux/cuivre/manguito18-1_2hembra.elmt
index 98693daaa..a22b3932c 100644
--- a/elements/12energie/eaux/cuivre/manguito18-1_2hembra.elmt
+++ b/elements/12energie/eaux/cuivre/manguito18-1_2hembra.elmt
@@ -1,5 +1,7 @@
-<definition width="40" version="0.4" hotspot_x="17" hotspot_y="28" height="40" type="element" ic="true" orientation="dyyy">
+<definition width="40" version="0.4" hotspot_x="17" hotspot_y="28" height="40" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="en">Sleeve 18 1/2 Female</name>
+        <name lang="fr">Manchon 18 1/2 Femelle</name>
         <name lang="es">Manguito 18 1/2 Hembra</name>
     </names>
     <informations></informations>
@@ -19,8 +21,8 @@
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-7.38571" x1="0" y2="-6.32857" x2="1.8"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7.41429" x1="0" y2="5.82857" x2="1.8"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3.68571" x1="1.8" y2="2.65714" x2="1.8"/>
-        <input x="-9" y="-16.5" size="4" rotate="true" text="1/2M-18"/>
-        <terminal x="-10.8" y="-0.514286" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="14.4" y="-0.514286" nameHidden="0" number="" name="" orientation="e"/>
+        <input x="-9" y="-16.5" size="4" rotate="true" text="1/2M-18" tagg="none"/>
+        <terminal x="-10.8" y="-0.514286" orientation="w"/>
+        <terminal x="14.4" y="-0.514286" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/cuivre/manguito18-1_2macho.elmt b/elements/12energie/eaux/cuivre/manguito18-1_2macho.elmt
index 3851a5460..3b7496b6b 100644
--- a/elements/12energie/eaux/cuivre/manguito18-1_2macho.elmt
+++ b/elements/12energie/eaux/cuivre/manguito18-1_2macho.elmt
@@ -1,5 +1,6 @@
-<definition width="40" version="0.4" hotspot_x="21" hotspot_y="27" height="40" type="element" ic="true" orientation="dyyy">
+<definition width="40" version="0.4" hotspot_x="21" hotspot_y="27" height="40" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="fr">manchon 18 1/2 Male</name>
         <name lang="es">Manguito 18 1/2 Macho</name>
     </names>
     <informations></informations>
@@ -16,8 +17,8 @@
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" x1="12.17" y2="-7.81388" x2="12.17"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" x1="1.53274" y2="8" x2="12.2537"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4.90616" x1="-2.35" y2="8" x2="0.95"/>
-        <input x="-14" y="-15" size="4" rotate="true" text="1/2M-18"/>
-        <terminal x="-13.9" y="0.210768" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="11.95" y="0.210768" nameHidden="0" number="" name="" orientation="e"/>
+        <input x="-14" y="-15" size="4" rotate="true" text="1/2M-18" tagg="none"/>
+        <terminal x="-13.9" y="0.210768" orientation="w"/>
+        <terminal x="11.95" y="0.210768" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/cuivre/manguito22-1hembra.elmt b/elements/12energie/eaux/cuivre/manguito22-1hembra.elmt
index 39d2f41be..915eff78b 100644
--- a/elements/12energie/eaux/cuivre/manguito22-1hembra.elmt
+++ b/elements/12energie/eaux/cuivre/manguito22-1hembra.elmt
@@ -1,5 +1,7 @@
-<definition width="40" version="0.4" hotspot_x="19" hotspot_y="32" height="50" type="element" ic="true" orientation="dyyy">
+<definition width="40" version="0.4" hotspot_x="19" hotspot_y="32" height="50" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="en">Sleeve 22 1" Female</name>
+        <name lang="fr">Manchon 22 1" Femelle</name>
         <name lang="es">Manguito 22 1" Hembra</name>
     </names>
     <informations></informations>
@@ -19,8 +21,8 @@
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9.69442" x1="-1.07147" y2="-8.25356" x2="0.807937"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10.4778" x1="-1.07147" y2="8.31646" x2="0.807937"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4.1133" x1="0.807937" y2="3.63741" x2="0.807937"/>
-        <input x="-12" y="-18" size="4" rotate="true" text="1&quot;H-22"/>
-        <terminal x="-12.348" y="0.244216" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="12.826" y="0.472517" nameHidden="0" number="" name="" orientation="e"/>
+        <input x="-12" y="-18" size="4" rotate="true" text="1&quot;H-22" tagg="none"/>
+        <terminal x="-12.348" y="0.244216" orientation="w"/>
+        <terminal x="12.826" y="0.472517" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/cuivre/manguito22-1macho.elmt b/elements/12energie/eaux/cuivre/manguito22-1macho.elmt
index 2dbe9448c..84c725959 100644
--- a/elements/12energie/eaux/cuivre/manguito22-1macho.elmt
+++ b/elements/12energie/eaux/cuivre/manguito22-1macho.elmt
@@ -1,5 +1,7 @@
-<definition width="30" version="0.4" hotspot_x="15" hotspot_y="27" height="40" type="element" ic="true" orientation="dyyy">
+<definition width="30" version="0.4" hotspot_x="15" hotspot_y="27" height="40" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="en">Sleeve 22 1 " male</name>
+        <name lang="fr">Manchon 22 1" male</name>
         <name lang="es">Manguito 22 1" Macho</name>
     </names>
     <informations></informations>
@@ -11,8 +13,8 @@
         <rect width="8.316" x="0.11475" y="-11.0508" antialias="false" height="22.0508" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <rect width="4.67775" x="3.753" y="-9.71437" antialias="false" height="19.378" style="line-style:dotted;line-weight:normal;filling:none;color:red"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-7.54584" x1="-10.188" y2="7.49165" x2="-8.56128"/>
-        <input x="-13" y="-17" size="4" rotate="true" text="1&quot;M-22"/>
-        <terminal x="-10.8" y="0.308713" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="8.9505" y="0.308713" nameHidden="0" number="" name="" orientation="e"/>
+        <input x="-13" y="-17" size="4" rotate="true" text="1&quot;M-22" tagg="none"/>
+        <terminal x="-10.8" y="0.308713" orientation="w"/>
+        <terminal x="8.9505" y="0.308713" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/cuivre/manguito22-3_4hembra.elmt b/elements/12energie/eaux/cuivre/manguito22-3_4hembra.elmt
index 662877125..f5ef09436 100644
--- a/elements/12energie/eaux/cuivre/manguito22-3_4hembra.elmt
+++ b/elements/12energie/eaux/cuivre/manguito22-3_4hembra.elmt
@@ -1,5 +1,7 @@
-<definition width="40" version="0.4" hotspot_x="16" hotspot_y="33" height="50" type="element" ic="true" orientation="dyyy">
+<definition width="40" version="0.4" hotspot_x="16" hotspot_y="33" height="50" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="en">Sleeve 22 3/4 female</name>
+        <name lang="fr">Manchon 22 3/4 femelle</name>
         <name lang="es">Manguito 22 3/4 Hembra</name>
     </names>
     <informations></informations>
@@ -19,8 +21,8 @@
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10.5425" x1="1.25654" y2="-9.06044" x2="3.05728"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10.2056" x1="1.25654" y2="7.98259" x2="3.05728"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5.35544" x1="3.05728" y2="3.53659" x2="3.05728"/>
-        <input x="-8" y="-19.5" size="4" rotate="true" text="3/4H-22"/>
-        <terminal x="-9.5479" y="-0.320106" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="15.4179" y="-0.0943451" nameHidden="0" number="" name="" orientation="e"/>
+        <input x="-8" y="-19.5" size="4" rotate="true" text="3/4H-22" tagg="none"/>
+        <terminal x="-9.5479" y="-0.320106" orientation="w"/>
+        <terminal x="15.4179" y="-0.0943451" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/cuivre/manguito22-3_4macho.elmt b/elements/12energie/eaux/cuivre/manguito22-3_4macho.elmt
index 206876569..e527af415 100644
--- a/elements/12energie/eaux/cuivre/manguito22-3_4macho.elmt
+++ b/elements/12energie/eaux/cuivre/manguito22-3_4macho.elmt
@@ -1,5 +1,7 @@
-<definition width="40" version="0.4" hotspot_x="17" hotspot_y="34" height="50" type="element" ic="true" orientation="dyyy">
+<definition width="40" version="0.4" hotspot_x="17" hotspot_y="34" height="50" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="en">Sleeve 22 3/4 Male</name>
+        <name lang="fr">Manchon 22 3/4 male</name>
         <name lang="es">Manguito 22 3/4 Macho</name>
     </names>
     <informations></informations>
@@ -11,8 +13,8 @@
         <rect width="10.5336" x="3.32535" y="-12.4509" antialias="false" height="23.4509" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <rect width="5.92515" x="7.9338" y="-11.0296" antialias="false" height="20.6084" style="line-style:dotted;line-weight:normal;filling:none;color:black"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-7.47646" x1="-9.1833" y2="6.7362" x2="-7.20825"/>
-        <input x="-10" y="-22" size="4" rotate="true" text="3/4M-22"/>
-        <terminal x="-10.5" y="-0.370132" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="14.5173" y="-0.370132" nameHidden="0" number="" name="" orientation="e"/>
+        <input x="-10" y="-22" size="4" rotate="true" text="3/4M-22" tagg="none"/>
+        <terminal x="-10.5" y="-0.370132" orientation="w"/>
+        <terminal x="14.5173" y="-0.370132" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/cuivre/racor15.elmt b/elements/12energie/eaux/cuivre/racor15.elmt
index 195839d8a..0b9e787bb 100644
--- a/elements/12energie/eaux/cuivre/racor15.elmt
+++ b/elements/12energie/eaux/cuivre/racor15.elmt
@@ -1,5 +1,7 @@
-<definition width="40" version="0.4" hotspot_x="17" hotspot_y="30" height="50" type="element" ic="true" orientation="dyyy">
+<definition width="50" version="0.4" hotspot_x="21" hotspot_y="30" height="50" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="en">Fitting 18-3/4</name>
+        <name lang="fr">Raccord 18-3/4</name>
         <name lang="es">Rácor 18-3/4</name>
     </names>
     <informations>Rafael Ferrando.
@@ -14,8 +16,8 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <arc width="3.74" x="-5.0575" y="-12.2184" antialias="true" height="8.06989" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4.93011" x1="-9.69383" y2="4.93011" x2="-3.69691"/>
         <arc width="3.2725" x="-4.59" y="-4.14853" antialias="true" height="9.07863" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <input x="-15" y="-16" size="4" rotate="true" text="rácor3/4-18"/>
-        <terminal x="-10.2" y="0.390788" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="12.7075" y="0.390788" nameHidden="1" number="" name="" orientation="e"/>
+        <input x="-15" y="-16" size="4" rotate="true" text="rácor3/4-18" tagg="none"/>
+        <terminal x="-10.2" y="0.390788" orientation="w"/>
+        <terminal x="12.7075" y="0.390788" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/cuivre/racor22-3_4.elmt b/elements/12energie/eaux/cuivre/racor22-3_4.elmt
index 529ac03ce..5631b7b43 100644
--- a/elements/12energie/eaux/cuivre/racor22-3_4.elmt
+++ b/elements/12energie/eaux/cuivre/racor22-3_4.elmt
@@ -1,5 +1,7 @@
-<definition width="40" version="0.4" hotspot_x="17" hotspot_y="30" height="50" type="element" ic="true" orientation="dyyy">
+<definition width="50" version="0.4" hotspot_x="21" hotspot_y="30" height="50" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="en">Fitting 22-3/4</name>
+        <name lang="fr">Raccord 22-3/4</name>
         <name lang="es">Rácor 22-3/4</name>
     </names>
     <informations>Rafael Ferrando.
@@ -14,8 +16,8 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <arc width="3.24" x="-4.845" y="-13.5321" antialias="true" height="8.81026" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5.18974" x1="-8.86147" y2="5.18974" x2="-3.66631"/>
         <arc width="2.835" x="-4.44" y="-4.72179" antialias="true" height="9.91154" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <input x="-15" y="-17" size="4" rotate="true" text="rácor3/4-22"/>
-        <terminal x="-9.3" y="0.233974" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="11.355" y="0.233974" nameHidden="1" number="" name="" orientation="e"/>
+        <input x="-15" y="-17" size="4" rotate="true" text="rácor3/4-22" tagg="none"/>
+        <terminal x="-9.3" y="0.233974" orientation="w"/>
+        <terminal x="11.355" y="0.233974" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/cuivre/rcaor15-1_2.elmt b/elements/12energie/eaux/cuivre/rcaor15-1_2.elmt
index 94ac0a3b7..386e8b1ec 100644
--- a/elements/12energie/eaux/cuivre/rcaor15-1_2.elmt
+++ b/elements/12energie/eaux/cuivre/rcaor15-1_2.elmt
@@ -1,5 +1,7 @@
-<definition width="40" version="0.4" hotspot_x="16" hotspot_y="25" height="40" type="element" ic="true" orientation="dyyy">
+<definition width="50" version="0.4" hotspot_x="20" hotspot_y="25" height="40" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="en">Fitting 15-1/2</name>
+        <name lang="fr">Raccord 15-1/2</name>
         <name lang="es">Rácor 15-1/2</name>
     </names>
     <informations>Rafael Ferrando.
@@ -14,8 +16,8 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <arc width="3.2" x="-4.6" y="-9.81538" antialias="true" height="5.77949" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3.39487" x1="-7.82952" y2="3.39487" x2="-3.36801"/>
         <arc width="2.8" x="-4.2" y="-4.0359" antialias="true" height="7.43077" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <input x="-14" y="-12" size="4" rotate="true" text="rácor1/2-15"/>
-        <terminal x="-8.2" y="-0.320513" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="9.8" y="-0.320513" nameHidden="1" number="" name="" orientation="e"/>
+        <input x="-14" y="-12" size="4" rotate="true" text="rácor1/2-15" tagg="none"/>
+        <terminal x="-8.2" y="-0.320513" orientation="w"/>
+        <terminal x="9.8" y="-0.320513" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/cuivre/te-22-15-22.elmt b/elements/12energie/eaux/cuivre/te-22-15-22.elmt
index ac5fce08b..37e3c1c1e 100644
--- a/elements/12energie/eaux/cuivre/te-22-15-22.elmt
+++ b/elements/12energie/eaux/cuivre/te-22-15-22.elmt
@@ -1,8 +1,10 @@
-<definition width="60" version="0.4" hotspot_x="27" hotspot_y="29" height="50" type="element" ic="true" orientation="dyyy">
+<definition width="60" version="0.4" hotspot_x="27" hotspot_y="29" height="50" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="en">Te 22-15-22 copper</name>
+        <name lang="fr">Te 22-15-22 cuivre</name>
         <name lang="es">Te cobre 22-15-22</name>
     </names>
-    <informations/>
+    <informations></informations>
     <description>
         <rect width="8.55" x="16.44" y="-9.83725" antialias="false" height="20.8373" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <rect width="8.55" x="-18.9" y="-10.4326" antialias="false" height="20.8373" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
@@ -15,8 +17,8 @@
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2.69305" x1="1.62" y2="-8.0512" x2="-1.51"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2.69305" x1="5.61" y2="-8.0512" x2="8.17"/>
         <text x="-10" y="16" size="4" text="Te22-15-22"/>
-        <terminal x="-18.9" y="-0.311652" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="24.99" y="-0.311652" nameHidden="0" number="" name="" orientation="e"/>
-        <terminal x="3" y="-24" nameHidden="0" number="" name="" orientation="n"/>
+        <terminal x="-18.9" y="-0.311652" orientation="w"/>
+        <terminal x="24.99" y="-0.311652" orientation="e"/>
+        <terminal x="3" y="-24" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/cuivre/te-22-18-22.elmt b/elements/12energie/eaux/cuivre/te-22-18-22.elmt
index 6cd0c48f4..8a561e6d2 100644
--- a/elements/12energie/eaux/cuivre/te-22-18-22.elmt
+++ b/elements/12energie/eaux/cuivre/te-22-18-22.elmt
@@ -1,8 +1,10 @@
-<definition width="60" version="0.4" hotspot_x="27" hotspot_y="28" height="50" type="element" ic="true" orientation="dyyy">
+<definition width="60" version="0.4" hotspot_x="27" hotspot_y="28" height="50" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="en">Te 22-18-22 copper</name>
+        <name lang="fr">Te 22-18-22 cuivre</name>
         <name lang="es">Te cobre 22-18-22</name>
     </names>
-    <informations/>
+    <informations></informations>
     <description>
         <rect width="8.55" x="16.44" y="-9.83725" antialias="false" height="20.8373" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <rect width="8.55" x="-18.9" y="-10.4326" antialias="false" height="20.8373" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
@@ -15,8 +17,8 @@
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2.69305" x1="1.62" y2="-8.0512" x2="-2.51"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2.69305" x1="5.61" y2="-8.0512" x2="9.17"/>
         <text x="-12" y="17" size="4" text="Te 22-18-22"/>
-        <terminal x="-18.9" y="-0.311652" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="24.99" y="-0.311652" nameHidden="0" number="" name="" orientation="e"/>
-        <terminal x="3" y="-24" nameHidden="0" number="" name="" orientation="n"/>
+        <terminal x="-18.9" y="-0.311652" orientation="w"/>
+        <terminal x="24.99" y="-0.311652" orientation="e"/>
+        <terminal x="3" y="-24" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/cuivre/te15.elmt b/elements/12energie/eaux/cuivre/te15.elmt
index 0b2409c7d..fa7bf148c 100644
--- a/elements/12energie/eaux/cuivre/te15.elmt
+++ b/elements/12energie/eaux/cuivre/te15.elmt
@@ -1,5 +1,7 @@
-<definition width="50" version="0.4" hotspot_x="25" hotspot_y="20" height="30" type="element" ic="true" orientation="dyyy">
+<definition width="50" version="0.4" hotspot_x="25" hotspot_y="20" height="30" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="en">Te 15 copper</name>
+        <name lang="fr">te 15 cuivre</name>
         <name lang="es">Te cobre 15</name>
     </names>
     <informations></informations>
@@ -15,8 +17,8 @@
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1.5821" x1="-2.765" y2="-4.10947" x2="-5.735"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1.5821" x1="1.195" y2="-4.10947" x2="4.165"/>
         <text x="-7" y="3" size="4" text="Te 15"/>
-        <terminal x="-18.2" y="0.220053" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="17.8" y="0.220053" nameHidden="0" number="" name="" orientation="e"/>
-        <terminal x="-0.785" y="-14.2189" nameHidden="0" number="" name="" orientation="n"/>
+        <terminal x="-18.2" y="0.220053" orientation="w"/>
+        <terminal x="17.8" y="0.220053" orientation="e"/>
+        <terminal x="-0.785" y="-14.2189" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/cuivre/te18.elmt b/elements/12energie/eaux/cuivre/te18.elmt
index 500a5a1cd..a68317ef2 100644
--- a/elements/12energie/eaux/cuivre/te18.elmt
+++ b/elements/12energie/eaux/cuivre/te18.elmt
@@ -1,5 +1,7 @@
-<definition width="50" version="0.4" hotspot_x="23" hotspot_y="26" height="40" type="element" ic="true" orientation="dyyy">
+<definition width="50" version="0.4" hotspot_x="23" hotspot_y="26" height="40" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="en">Te 18 copper</name>
+        <name lang="fr">te 18 cuivre</name>
         <name lang="es">Te cobre 18</name>
     </names>
     <informations></informations>
@@ -15,8 +17,8 @@
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3.00222" x1="-1.31" y2="-6.14571" x2="-4.37"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3.00222" x1="3.79" y2="-6.14571" x2="6.85"/>
         <text x="-6" y="2" size="4" text="Te 18"/>
-        <terminal x="-17" y="0" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="20" y="0" nameHidden="0" number="" name="" orientation="e"/>
-        <terminal x="1.24" y="-18.1958" nameHidden="0" number="" name="" orientation="n"/>
+        <terminal x="-17" y="0" orientation="w"/>
+        <terminal x="20" y="0" orientation="e"/>
+        <terminal x="1.24" y="-18.1958" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/cuivre/te22.elmt b/elements/12energie/eaux/cuivre/te22.elmt
index d7663284c..2296064c5 100644
--- a/elements/12energie/eaux/cuivre/te22.elmt
+++ b/elements/12energie/eaux/cuivre/te22.elmt
@@ -1,5 +1,7 @@
-<definition width="60" version="0.4" hotspot_x="27" hotspot_y="32" height="50" type="element" ic="true" orientation="dyyy">
+<definition width="60" version="0.4" hotspot_x="27" hotspot_y="32" height="50" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="en">Te 22 copper</name>
+        <name lang="fr">te 22 cuivre</name>
         <name lang="es">Te cobre 22</name>
     </names>
     <informations></informations>
@@ -15,8 +17,8 @@
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2.69305" x1="1.62" y2="-8.0512" x2="-3.51"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2.69305" x1="5.61" y2="-8.0512" x2="10.17"/>
         <text x="-5" y="5" size="4" text="Te 22"/>
-        <terminal x="-18.9" y="-0.311652" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="24.99" y="-0.311652" nameHidden="0" number="" name="" orientation="e"/>
-        <terminal x="3" y="-24" nameHidden="0" number="" name="" orientation="n"/>
+        <terminal x="-18.9" y="-0.311652" orientation="w"/>
+        <terminal x="24.99" y="-0.311652" orientation="e"/>
+        <terminal x="3" y="-24" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/cuivre/tubo18.elmt b/elements/12energie/eaux/cuivre/tubo18.elmt
index 62dfbdcd5..18e0671ee 100644
--- a/elements/12energie/eaux/cuivre/tubo18.elmt
+++ b/elements/12energie/eaux/cuivre/tubo18.elmt
@@ -1,12 +1,14 @@
-<definition width="70" version="0.4" hotspot_x="33" hotspot_y="10" height="20" type="element" ic="true" orientation="dyyy">
+<definition width="70" version="0.4" hotspot_x="33" hotspot_y="10" height="20" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="en">18 Copper Tube</name>
+        <name lang="fr">Tube cuivre 18</name>
         <name lang="es">Tubo Cobre 18</name>
     </names>
-    <informations/>
+    <informations></informations>
     <description>
         <rect width="61" x="-29" y="-7.15763" antialias="false" height="14.1576" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <text x="-10" y="1" size="4" text="Cu15"/>
-        <terminal x="-29" y="0" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="33" y="0" nameHidden="0" number="" name="" orientation="e"/>
+        <terminal x="-29" y="0" orientation="w"/>
+        <terminal x="33" y="0" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/cuivre/tubo22.elmt b/elements/12energie/eaux/cuivre/tubo22.elmt
index c1358df20..85df31396 100644
--- a/elements/12energie/eaux/cuivre/tubo22.elmt
+++ b/elements/12energie/eaux/cuivre/tubo22.elmt
@@ -1,12 +1,14 @@
-<definition width="60" version="0.4" hotspot_x="28" hotspot_y="16" height="30" type="element" ic="true" orientation="dyyy">
+<definition width="60" version="0.4" hotspot_x="28" hotspot_y="16" height="30" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="en">22 Copper Tube</name>
+        <name lang="fr">Tube 22 cuivre</name>
         <name lang="es">Tubo Cobre 22</name>
     </names>
-    <informations/>
+    <informations></informations>
     <description>
         <rect width="48.8" x="-22.4" y="-9.99447" antialias="false" height="17.9945" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <text x="-8" y="0.930742" size="4" text="Cu22"/>
-        <terminal x="-23" y="0" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="27" y="0" nameHidden="0" number="" name="" orientation="e"/>
+        <terminal x="-23" y="0" orientation="w"/>
+        <terminal x="27" y="0" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/cuivre/tubocobre15.elmt b/elements/12energie/eaux/cuivre/tubocobre15.elmt
index 436b3ead9..570ed2e04 100644
--- a/elements/12energie/eaux/cuivre/tubocobre15.elmt
+++ b/elements/12energie/eaux/cuivre/tubocobre15.elmt
@@ -1,12 +1,14 @@
-<definition width="60" version="0.4" hotspot_x="28" hotspot_y="10" height="20" type="element" ic="true" orientation="dyyy">
+<definition width="60" version="0.4" hotspot_x="28" hotspot_y="10" height="20" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="en">15 Copper Tube</name>
+        <name lang="fr">Tube 15 cuivre</name>
         <name lang="es">Tubo cobre 15</name>
     </names>
-    <informations/>
+    <informations></informations>
     <description>
         <rect width="48.8" x="-22.6" y="-5.63888" antialias="false" height="11.6389" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <text x="-5.8" y="1.56614" size="3" text="Cu15"/>
-        <terminal x="-23.4" y="0.00983577" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="27" y="0.00983577" nameHidden="0" number="" name="" orientation="e"/>
+        <terminal x="-23.4" y="0.00983577" orientation="w"/>
+        <terminal x="27" y="0.00983577" orientation="e"/>
     </description>
 </definition>