diff --git a/elements/bornes/oddzielacz.elmt b/elements/bornes/barrette_connexion_f.elmt
similarity index 82%
rename from elements/bornes/oddzielacz.elmt
rename to elements/bornes/barrette_connexion_f.elmt
index 8f6c13397..07c8184cc 100644
--- a/elements/bornes/oddzielacz.elmt
+++ b/elements/bornes/barrette_connexion_f.elmt
@@ -1,16 +1,21 @@
-<definition width="40" version="0.22" hotspot_x="15" hotspot_y="10" height="60" type="element" orientation="dyyy">
-    <names>
-        <name lang="pl">Oddzielacz</name>
-    </names>
-    <informations>EN 60617: 03-03-18</informations>
-    <description>
-        <input x="4" y="22" size="8" rotate="true" text="_"/>
-        <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="12" x1="0" y2="28" x2="0"/>
-        <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="-4" y2="10" x2="4"/>
-        <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="0" x1="0" y2="10" x2="0"/>
-        <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="30" x1="0" y2="40" x2="0"/>
-        <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="30" x1="-4" y2="30" x2="4"/>
-        <terminal x="0" y="40" orientation="s"/>
-        <terminal x="0" y="0" orientation="n"/>
-    </description>
-</definition>
+<definition width="40" version="0.3" hotspot_x="15" hotspot_y="10" height="60" type="element" orientation="dyyy">
+    <names>
+        <name lang="de">Stirnkontaktverbindung
+Trennstelle, Lasche geschlossen
+</name>
+        <name lang="fr">Barrette de connexion, fermée
+</name>
+        <name lang="pl">Oddzielacz</name>
+    </names>
+    <informations>EN 60617: 03-03-18</informations>
+    <description>
+        <input x="4" y="22" size="8" rotate="true" text="_"/>
+        <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="12" x1="0" y2="28" x2="0"/>
+        <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="-4" y2="10" x2="4"/>
+        <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="0" x1="0" y2="10" x2="0"/>
+        <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="30" x1="0" y2="40" x2="0"/>
+        <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="30" x1="-4" y2="30" x2="4"/>
+        <terminal x="0" y="40" orientation="s"/>
+        <terminal x="0" y="0" orientation="n"/>
+    </description>
+</definition>
diff --git a/elements/bornes/terminal.elmt b/elements/bornes/borne_f.elmt
similarity index 100%
rename from elements/bornes/terminal.elmt
rename to elements/bornes/borne_f.elmt
diff --git a/elements/bornes/borniers/listwa_zaciskowa.elmt b/elements/bornes/borniers/bornier_1.elmt
similarity index 90%
rename from elements/bornes/borniers/listwa_zaciskowa.elmt
rename to elements/bornes/borniers/bornier_1.elmt
index 4d16d7ab1..154877973 100644
--- a/elements/bornes/borniers/listwa_zaciskowa.elmt
+++ b/elements/bornes/borniers/bornier_1.elmt
@@ -1,32 +1,34 @@
-<definition width="130" version="0.22" hotspot_x="15" hotspot_y="35" height="60" type="element" orientation="dyyy">
-    <names>
-        <name lang="pl">Listwa zaciskowa</name>
-    </names>
-    <informations>EN 60617: 03-02-03</informations>
-    <description>
-        <rect width="20" x="90" y="-30" antialias="false" height="50" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="20" x="70" y="-30" antialias="false" height="50" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="20" x="-10" y="-30" antialias="false" height="50" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="92" y="-19" size="8" rotate="true" text="6"/>
-        <input x="72" y="-19" size="8" rotate="true" text="5"/>
-        <rect width="20" x="50" y="-30" antialias="false" height="50" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="20" x="30" y="-30" antialias="false" height="50" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="20" x="10" y="-30" antialias="false" height="50" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="52" y="-19" size="8" rotate="true" text="4"/>
-        <input x="32" y="-19" size="8" rotate="true" text="3"/>
-        <input x="12" y="-19" size="8" rotate="true" text="2"/>
-        <input x="-8" y="-19" size="8" rotate="true" text="1"/>
-        <terminal x="0" y="-30" orientation="n"/>
-        <terminal x="0" y="20" orientation="s"/>
-        <terminal x="20" y="-30" orientation="n"/>
-        <terminal x="20" y="20" orientation="s"/>
-        <terminal x="40" y="-30" orientation="n"/>
-        <terminal x="40" y="20" orientation="s"/>
-        <terminal x="60" y="-30" orientation="n"/>
-        <terminal x="60" y="20" orientation="s"/>
-        <terminal x="80" y="-30" orientation="n"/>
-        <terminal x="80" y="20" orientation="s"/>
-        <terminal x="100" y="-30" orientation="n"/>
-        <terminal x="100" y="20" orientation="s"/>
-    </description>
-</definition>
+<definition width="130" version="0.3" hotspot_x="15" hotspot_y="35" height="60" type="element" orientation="dyyy">
+    <names>
+        <name lang="en">Terminal block</name>
+        <name lang="fr">Bornier</name>
+        <name lang="pl">Listwa zaciskowa</name>
+    </names>
+    <informations>EN 60617: 03-02-03</informations>
+    <description>
+        <rect width="20" x="90" y="-30" antialias="false" height="50" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="20" x="70" y="-30" antialias="false" height="50" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="20" x="-10" y="-30" antialias="false" height="50" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <input x="92" y="-19" size="8" rotate="true" text="6"/>
+        <input x="72" y="-19" size="8" rotate="true" text="5"/>
+        <rect width="20" x="50" y="-30" antialias="false" height="50" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="20" x="30" y="-30" antialias="false" height="50" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="20" x="10" y="-30" antialias="false" height="50" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <input x="52" y="-19" size="8" rotate="true" text="4"/>
+        <input x="32" y="-19" size="8" rotate="true" text="3"/>
+        <input x="12" y="-19" size="8" rotate="true" text="2"/>
+        <input x="-8" y="-19" size="8" rotate="true" text="1"/>
+        <terminal x="0" y="-30" orientation="n"/>
+        <terminal x="0" y="20" orientation="s"/>
+        <terminal x="20" y="-30" orientation="n"/>
+        <terminal x="20" y="20" orientation="s"/>
+        <terminal x="40" y="-30" orientation="n"/>
+        <terminal x="40" y="20" orientation="s"/>
+        <terminal x="60" y="-30" orientation="n"/>
+        <terminal x="60" y="20" orientation="s"/>
+        <terminal x="80" y="-30" orientation="n"/>
+        <terminal x="80" y="20" orientation="s"/>
+        <terminal x="100" y="-30" orientation="n"/>
+        <terminal x="100" y="20" orientation="s"/>
+    </description>
+</definition>
diff --git a/elements/bornes/wtyk.elmt b/elements/bornes/contact_prise_fiche.elmt
similarity index 78%
rename from elements/bornes/wtyk.elmt
rename to elements/bornes/contact_prise_fiche.elmt
index bee23ad02..8b35b8146 100644
--- a/elements/bornes/wtyk.elmt
+++ b/elements/bornes/contact_prise_fiche.elmt
@@ -1,13 +1,17 @@
-<definition width="40" version="0.22" hotspot_x="15" hotspot_y="20" height="40" type="element" orientation="dyyy">
-    <names>
-        <name lang="pl">Wtyk</name>
-    </names>
-    <informations>EN 60617: 03-03-03</informations>
-    <description>
-        <input x="1" y="2" size="8" rotate="true" text="_"/>
-        <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" y2="-1" 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="-8" x1="0" y2="10" x2="0"/>
-        <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" y2="-1" x2="1"/>
-        <terminal x="0" y="10" orientation="s"/>
-    </description>
-</definition>
+<definition width="40" version="0.3" hotspot_x="15" hotspot_y="20" height="40" type="element" orientation="dyyy">
+    <names>
+        <name lang="de">Pol eines Steckers
+Stecker
+</name>
+        <name lang="fr">Contact mâle fiche</name>
+        <name lang="pl">Wtyk</name>
+    </names>
+    <informations>EN 60617: 03-03-03</informations>
+    <description>
+        <input x="1" y="2" size="8" rotate="true" text="_"/>
+        <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" y2="-1" 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="-8" x1="0" y2="10" x2="0"/>
+        <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" y2="-1" x2="1"/>
+        <terminal x="0" y="10" orientation="s"/>
+    </description>
+</definition>
diff --git a/elements/bornes/listwa_zaciskowa.elmt b/elements/bornes/listwa_zaciskowa.elmt
deleted file mode 100644
index 4d16d7ab1..000000000
--- a/elements/bornes/listwa_zaciskowa.elmt
+++ /dev/null
@@ -1,32 +0,0 @@
-<definition width="130" version="0.22" hotspot_x="15" hotspot_y="35" height="60" type="element" orientation="dyyy">
-    <names>
-        <name lang="pl">Listwa zaciskowa</name>
-    </names>
-    <informations>EN 60617: 03-02-03</informations>
-    <description>
-        <rect width="20" x="90" y="-30" antialias="false" height="50" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="20" x="70" y="-30" antialias="false" height="50" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="20" x="-10" y="-30" antialias="false" height="50" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="92" y="-19" size="8" rotate="true" text="6"/>
-        <input x="72" y="-19" size="8" rotate="true" text="5"/>
-        <rect width="20" x="50" y="-30" antialias="false" height="50" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="20" x="30" y="-30" antialias="false" height="50" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="20" x="10" y="-30" antialias="false" height="50" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="52" y="-19" size="8" rotate="true" text="4"/>
-        <input x="32" y="-19" size="8" rotate="true" text="3"/>
-        <input x="12" y="-19" size="8" rotate="true" text="2"/>
-        <input x="-8" y="-19" size="8" rotate="true" text="1"/>
-        <terminal x="0" y="-30" orientation="n"/>
-        <terminal x="0" y="20" orientation="s"/>
-        <terminal x="20" y="-30" orientation="n"/>
-        <terminal x="20" y="20" orientation="s"/>
-        <terminal x="40" y="-30" orientation="n"/>
-        <terminal x="40" y="20" orientation="s"/>
-        <terminal x="60" y="-30" orientation="n"/>
-        <terminal x="60" y="20" orientation="s"/>
-        <terminal x="80" y="-30" orientation="n"/>
-        <terminal x="80" y="20" orientation="s"/>
-        <terminal x="100" y="-30" orientation="n"/>
-        <terminal x="100" y="20" orientation="s"/>
-    </description>
-</definition>
diff --git a/elements/bornes/zlacze_wtykowe.elmt b/elements/bornes/prise_fiche.elmt
similarity index 85%
rename from elements/bornes/zlacze_wtykowe.elmt
rename to elements/bornes/prise_fiche.elmt
index 77ad55570..8a19917bd 100644
--- a/elements/bornes/zlacze_wtykowe.elmt
+++ b/elements/bornes/prise_fiche.elmt
@@ -1,16 +1,20 @@
-<definition width="40" version="0.22" hotspot_x="15" hotspot_y="20" height="50" type="element" orientation="dyyy">
-    <names>
-        <name lang="pl">Złącze wtykowe</name>
-    </names>
-    <informations>EN 60617: 03-03-05</informations>
-    <description>
-        <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" x1="-1" y2="9" x2="-1"/>
-        <input x="3" y="5" size="8" rotate="true" text="_"/>
-        <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" x1="0" y2="20" x2="0"/>
-        <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" x1="0" y2="-10" x2="0"/>
-        <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" x1="1" y2="9" x2="1"/>
-        <arc width="6" x="-3" y="0" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <terminal x="0" y="-10" orientation="n"/>
-        <terminal x="0" y="20" orientation="s"/>
-    </description>
-</definition>
+<definition width="40" version="0.3" hotspot_x="15" hotspot_y="20" height="50" type="element" orientation="dyyy">
+    <names>
+        <name lang="de">Stecker und Buchse
+</name>
+        <name lang="fr">Fiche et prise
+</name>
+        <name lang="pl">Złącze wtykowe</name>
+    </names>
+    <informations>EN 60617: 03-03-05</informations>
+    <description>
+        <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" x1="-1" y2="9" x2="-1"/>
+        <input x="3" y="5" size="8" rotate="true" text="_"/>
+        <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" x1="0" y2="20" x2="0"/>
+        <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" x1="0" y2="-10" x2="0"/>
+        <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" x1="1" y2="9" x2="1"/>
+        <arc width="6" x="-3" y="0" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
+        <terminal x="0" y="-10" orientation="n"/>
+        <terminal x="0" y="20" orientation="s"/>
+    </description>
+</definition>
diff --git a/elements/bornes/zlacze_wielostykowe.elmt b/elements/bornes/prise_multipolaire.elmt
similarity index 96%
rename from elements/bornes/zlacze_wielostykowe.elmt
rename to elements/bornes/prise_multipolaire.elmt
index f92389c93..bf4478068 100644
--- a/elements/bornes/zlacze_wielostykowe.elmt
+++ b/elements/bornes/prise_multipolaire.elmt
@@ -1,53 +1,58 @@
-<definition width="90" version="0.22" hotspot_x="15" hotspot_y="35" height="40" type="element" orientation="dyyy">
-    <names>
-        <name lang="pl">Złącze wielostykowe</name>
-    </names>
-    <informations>EN 60617: 03-03-07</informations>
-    <description>
-        <input x="53" y="-16" size="8" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="-24" x1="0" y2="-24" x2="49"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="-12" x1="2" y2="-12" x2="48"/>
-        <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="-18" x1="49" y2="-11" x2="49"/>
-        <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="-18" x1="39" y2="-11" x2="39"/>
-        <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="-18" x1="29" y2="-11" x2="29"/>
-        <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="-18" x1="19" y2="-11" x2="19"/>
-        <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="-18" x1="9" y2="-11" 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="-18" x1="-1" y2="-11" 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="-18" x1="50" y2="0" x2="50"/>
-        <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="-18" x1="40" y2="0" x2="40"/>
-        <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="-18" x1="30" y2="0" x2="30"/>
-        <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="-18" x1="20" y2="0" x2="20"/>
-        <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="-18" x1="10" y2="0" x2="10"/>
-        <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="-18" x1="0" y2="0" x2="0"/>
-        <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="-21" x1="50" y2="-30" x2="50"/>
-        <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="-21" x1="40" y2="-30" x2="40"/>
-        <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="-21" x1="30" y2="-30" x2="30"/>
-        <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="-21" x1="20" y2="-30" x2="20"/>
-        <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="-21" x1="10" y2="-30" x2="10"/>
-        <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="-21" x1="0" y2="-30" x2="0"/>
-        <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="-18" x1="51" y2="-11" x2="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="-18" x1="41" y2="-11" x2="41"/>
-        <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="-18" x1="31" y2="-11" x2="31"/>
-        <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="-18" x1="21" y2="-11" x2="21"/>
-        <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="-18" x1="11" y2="-11" x2="11"/>
-        <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="-18" x1="1" y2="-11" x2="1"/>
-        <arc width="6" x="47" y="-20" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <arc width="6" x="37" y="-20" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <arc width="6" x="27" y="-20" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <arc width="6" x="17" y="-20" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <arc width="6" x="7" y="-20" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <arc width="6" x="-3" y="-20" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <terminal x="0" y="-30" orientation="n"/>
-        <terminal x="0" y="0" orientation="s"/>
-        <terminal x="10" y="-30" orientation="n"/>
-        <terminal x="10" y="0" orientation="s"/>
-        <terminal x="20" y="-30" orientation="n"/>
-        <terminal x="20" y="0" orientation="s"/>
-        <terminal x="30" y="-30" orientation="n"/>
-        <terminal x="30" y="0" orientation="s"/>
-        <terminal x="40" y="-30" orientation="n"/>
-        <terminal x="40" y="0" orientation="s"/>
-        <terminal x="50" y="-30" orientation="n"/>
-        <terminal x="50" y="0" orientation="s"/>
-    </description>
-</definition>
+<definition width="90" version="0.3" hotspot_x="15" hotspot_y="35" height="40" type="element" orientation="dyyy">
+    <names>
+        <name lang="de">Verbinder, Buchse und Stecker, allpolige
+Darstellung
+</name>
+        <name lang="fr">Prise et fiche multipolaires
+</name>
+        <name lang="pl">Złącze wielostykowe</name>
+    </names>
+    <informations>EN 60617: 03-03-07</informations>
+    <description>
+        <input x="53" y="-16" size="8" rotate="true" text="_"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="-24" x1="0" y2="-24" x2="49"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="-12" x1="2" y2="-12" x2="48"/>
+        <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="-18" x1="49" y2="-11" x2="49"/>
+        <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="-18" x1="39" y2="-11" x2="39"/>
+        <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="-18" x1="29" y2="-11" x2="29"/>
+        <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="-18" x1="19" y2="-11" x2="19"/>
+        <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="-18" x1="9" y2="-11" 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="-18" x1="-1" y2="-11" 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="-18" x1="50" y2="0" x2="50"/>
+        <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="-18" x1="40" y2="0" x2="40"/>
+        <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="-18" x1="30" y2="0" x2="30"/>
+        <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="-18" x1="20" y2="0" x2="20"/>
+        <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="-18" x1="10" y2="0" x2="10"/>
+        <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="-18" x1="0" y2="0" x2="0"/>
+        <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="-21" x1="50" y2="-30" x2="50"/>
+        <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="-21" x1="40" y2="-30" x2="40"/>
+        <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="-21" x1="30" y2="-30" x2="30"/>
+        <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="-21" x1="20" y2="-30" x2="20"/>
+        <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="-21" x1="10" y2="-30" x2="10"/>
+        <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="-21" x1="0" y2="-30" x2="0"/>
+        <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="-18" x1="51" y2="-11" x2="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="-18" x1="41" y2="-11" x2="41"/>
+        <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="-18" x1="31" y2="-11" x2="31"/>
+        <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="-18" x1="21" y2="-11" x2="21"/>
+        <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="-18" x1="11" y2="-11" x2="11"/>
+        <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="-18" x1="1" y2="-11" x2="1"/>
+        <arc width="6" x="47" y="-20" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
+        <arc width="6" x="37" y="-20" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
+        <arc width="6" x="27" y="-20" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
+        <arc width="6" x="17" y="-20" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
+        <arc width="6" x="7" y="-20" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
+        <arc width="6" x="-3" y="-20" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
+        <terminal x="0" y="-30" orientation="n"/>
+        <terminal x="0" y="0" orientation="s"/>
+        <terminal x="10" y="-30" orientation="n"/>
+        <terminal x="10" y="0" orientation="s"/>
+        <terminal x="20" y="-30" orientation="n"/>
+        <terminal x="20" y="0" orientation="s"/>
+        <terminal x="30" y="-30" orientation="n"/>
+        <terminal x="30" y="0" orientation="s"/>
+        <terminal x="40" y="-30" orientation="n"/>
+        <terminal x="40" y="0" orientation="s"/>
+        <terminal x="50" y="-30" orientation="n"/>
+        <terminal x="50" y="0" orientation="s"/>
+    </description>
+</definition>
diff --git a/elements/bornes/zlacze_wielostykowe_2.elmt b/elements/bornes/prise_multipolaire_2.elmt
similarity index 83%
rename from elements/bornes/zlacze_wielostykowe_2.elmt
rename to elements/bornes/prise_multipolaire_2.elmt
index a809e1f90..27e0a393e 100644
--- a/elements/bornes/zlacze_wielostykowe_2.elmt
+++ b/elements/bornes/prise_multipolaire_2.elmt
@@ -1,18 +1,24 @@
-<definition width="40" version="0.22" hotspot_x="15" hotspot_y="10" height="50" type="element" orientation="dyyy">
-    <names>
-        <name lang="pl">Złącze wielostykowe</name>
-    </names>
-    <informations>EN 60617: 03-03-08</informations>
-    <description>
-        <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="13" x1="-5" y2="20" x2="4"/>
-        <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="12" x1="-1" y2="19" x2="-1"/>
-        <input x="1" y="20.5" size="5" rotate="true" text="6"/>
-        <input x="7" y="15" size="8" rotate="true" text="_"/>
-        <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="12" x1="0" y2="30" x2="0"/>
-        <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="0" y2="0" x2="0"/>
-        <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="12" x1="1" y2="19" x2="1"/>
-        <arc width="6" x="-3" y="10" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <terminal x="0" y="0" orientation="n"/>
-        <terminal x="0" y="30" orientation="s"/>
-    </description>
-</definition>
+<definition width="40" version="0.3" hotspot_x="15" hotspot_y="10" height="50" type="element" orientation="dyyy">
+    <names>
+        <name lang="de">Buchse und Stecker vielpolig, in einpoliger
+Darstellung
+</name>
+        <name lang="fr">Prise et fiche multipolaires, représentation
+unifilaire
+</name>
+        <name lang="pl">Złącze wielostykowe</name>
+    </names>
+    <informations>EN 60617: 03-03-08</informations>
+    <description>
+        <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="13" x1="-5" y2="20" x2="4"/>
+        <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="12" x1="-1" y2="19" x2="-1"/>
+        <input x="1" y="20.5" size="5" rotate="true" text="6"/>
+        <input x="7" y="15" size="8" rotate="true" text="_"/>
+        <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="12" x1="0" y2="30" x2="0"/>
+        <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="0" y2="0" x2="0"/>
+        <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="12" x1="1" y2="19" x2="1"/>
+        <arc width="6" x="-3" y="10" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
+        <terminal x="0" y="0" orientation="n"/>
+        <terminal x="0" y="30" orientation="s"/>
+    </description>
+</definition>
diff --git a/elements/nomenclatures/bases/prad_przemienny_3n.elmt b/elements/nomenclatures/bases/etiquette_triphase.elmt
similarity index 82%
rename from elements/nomenclatures/bases/prad_przemienny_3n.elmt
rename to elements/nomenclatures/bases/etiquette_triphase.elmt
index b85ce931b..339aff112 100644
--- a/elements/nomenclatures/bases/prad_przemienny_3n.elmt
+++ b/elements/nomenclatures/bases/etiquette_triphase.elmt
@@ -1,13 +1,15 @@
-<definition width="120" version="0.22" hotspot_x="15" hotspot_y="35" height="40" type="element" orientation="dyyy">
-    <names>
-        <name lang="pl">Prąd przemienny trójfazowy</name>
-    </names>
-    <informations>EN 60617: 02-02-07</informations>
-    <description>
-        <input x="-15" y="-15" size="8" rotate="true" text="3N"/>
-        <arc width="5" x="13.5" y="-17.2" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-20" angle="-100"/>
-        <arc width="5" x="3.5" y="-17.8" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-200" angle="-100"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17" x1="8" y2="-13" x2="14"/>
-        <input x="16" y="-15" size="8" rotate="true" text="50 Hz 400/230V"/>
-    </description>
-</definition>
+<definition width="120" version="0.3" hotspot_x="15" hotspot_y="35" height="40" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Courant alternatif
+etiquette</name>
+        <name lang="pl">Prąd przemienny trójfazowy</name>
+    </names>
+    <informations>EN 60617: 02-02-07</informations>
+    <description>
+        <input x="-15" y="-15" size="8" rotate="true" text="3N"/>
+        <arc width="5" x="13.5" y="-17.2" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-20" angle="-100"/>
+        <arc width="5" x="3.5" y="-17.8" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-200" angle="-100"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17" x1="8" y2="-13" x2="14"/>
+        <input x="16" y="-15" size="8" rotate="true" text="50 Hz 400/230V"/>
+    </description>
+</definition>
diff --git a/elements/protections/murr_fusible_electronique.elmt b/elements/protections/control_relays/murr_fusible_electronique.elmt
similarity index 100%
rename from elements/protections/murr_fusible_electronique.elmt
rename to elements/protections/control_relays/murr_fusible_electronique.elmt
diff --git a/examples/domestique.qet b/examples/domestique.qet
index 09c81844f..e4b21d1ed 100644
--- a/examples/domestique.qet
+++ b/examples/domestique.qet
@@ -1,345 +1,345 @@
-<project title="" version="0.2" >
+<project title="" version="0.3">
     <newdiagrams>
-        <border displayrows="true" cols="17" displaycols="true" colsize="60" rows="8" rowsize="80" />
-        <inset title="" folio="" author="" filename="" date="null" />
-        <conductors num="_" type="multi" />
+        <border displayrows="true" cols="17" displaycols="true" colsize="60" rows="8" rowsize="80"/>
+        <inset title="" folio="" author="" filename="" date="null"/>
+        <conductors num="_" type="multi"/>
     </newdiagrams>
-    <diagram title="Exemple d'installation domestique" displayrows="true" cols="15" folio="" displaycols="true" height="340" colsize="50" order="1" rows="4" author="Benoît A" filename="Exemples QET" rowsize="80" >
-        <defaultconductor neutral="true" phase="1" ground="true" type="single" />
+    <diagram title="Exemple d'installation domestique" displayrows="true" cols="15" folio="" displaycols="true" height="340" colsize="50" order="1" rows="4" author="Benoît A" filename="Exemples QET" rowsize="80">
+        <defaultconductor neutral="true" phase="1" ground="true" type="single"/>
         <elements>
-            <element x="150" y="220" type="common://protections/disjoncteurs/disjoncteur1.elmt" orientation="0" >
+            <element x="150" y="220" type="common://protections/disjoncteurs/disjoncteur1.elmt" orientation="0">
                 <terminals>
-                    <terminal x="0" y="-17" id="0" orientation="0" />
-                    <terminal x="0" y="17" id="1" orientation="2" />
+                    <terminal x="0" y="-17" id="0" orientation="0"/>
+                    <terminal x="0" y="17" id="1" orientation="2"/>
                 </terminals>
                 <inputs>
-                    <input x="2.75" y="3" text="PC" />
+                    <input x="2.75" y="3" text="PC"/>
                 </inputs>
             </element>
-            <element x="650" y="310" type="common://recepteurs/misc/pc.elmt" orientation="0" >
+            <element x="650" y="310" type="common://recepteurs/misc/pc.elmt" orientation="0">
                 <terminals>
-                    <terminal x="0" y="-17" id="2" orientation="0" />
+                    <terminal x="0" y="-17" id="2" orientation="0"/>
                 </terminals>
                 <inputs/>
             </element>
-            <element x="350" y="300" type="common://recepteurs/domestiques/convecteur.elmt" orientation="0" >
+            <element x="350" y="300" type="common://recepteurs/domestiques/convecteur.elmt" orientation="0">
                 <terminals>
-                    <terminal x="0" y="-8" id="3" orientation="0" />
+                    <terminal x="0" y="-8" id="3" orientation="0"/>
                 </terminals>
                 <inputs/>
             </element>
-            <element x="250" y="300" type="common://recepteurs/domestiques/convecteur.elmt" orientation="0" >
+            <element x="250" y="300" type="common://recepteurs/domestiques/convecteur.elmt" orientation="0">
                 <terminals>
-                    <terminal x="0" y="-8" id="4" orientation="0" />
+                    <terminal x="0" y="-8" id="4" orientation="0"/>
                 </terminals>
                 <inputs/>
             </element>
-            <element x="200" y="310" type="common://recepteurs/lampes/lampe1.elmt" orientation="0" >
+            <element x="200" y="310" type="common://recepteurs/lampes/lampe1.elmt" orientation="0">
                 <terminals>
-                    <terminal x="0" y="-17" id="5" orientation="0" />
+                    <terminal x="0" y="-17" id="5" orientation="0"/>
                 </terminals>
                 <inputs>
-                    <input x="15" y="3" text="" />
+                    <input x="15" y="3" text=""/>
                 </inputs>
             </element>
-            <element x="50" y="220" type="common://protections/disjoncteurs/disjoncteur1.elmt" orientation="0" >
+            <element x="50" y="220" type="common://protections/disjoncteurs/disjoncteur1.elmt" orientation="0">
                 <terminals>
-                    <terminal x="0" y="-17" id="6" orientation="0" />
-                    <terminal x="0" y="17" id="7" orientation="2" />
+                    <terminal x="0" y="-17" id="6" orientation="0"/>
+                    <terminal x="0" y="17" id="7" orientation="2"/>
                 </terminals>
                 <inputs>
-                    <input x="2.75" y="3" text="PC" />
+                    <input x="2.75" y="3" text="PC"/>
                 </inputs>
             </element>
-            <element x="450" y="300" type="common://recepteurs/domestiques/lave_vaiselle.elmt" orientation="0" >
+            <element x="450" y="300" type="common://recepteurs/domestiques/lave_vaiselle.elmt" orientation="0">
                 <terminals>
-                    <terminal x="0" y="-8" id="8" orientation="0" />
+                    <terminal x="0" y="-8" id="8" orientation="0"/>
                 </terminals>
                 <inputs/>
             </element>
-            <element x="150" y="310" type="common://recepteurs/misc/pc.elmt" orientation="0" >
+            <element x="150" y="310" type="common://recepteurs/misc/pc.elmt" orientation="0">
                 <terminals>
-                    <terminal x="0" y="-17" id="9" orientation="0" />
+                    <terminal x="0" y="-17" id="9" orientation="0"/>
                 </terminals>
                 <inputs/>
             </element>
-            <element x="100" y="220" type="common://protections/disjoncteurs/disjoncteur1.elmt" orientation="0" >
+            <element x="100" y="220" type="common://protections/disjoncteurs/disjoncteur1.elmt" orientation="0">
                 <terminals>
-                    <terminal x="0" y="-17" id="10" orientation="0" />
-                    <terminal x="0" y="17" id="11" orientation="2" />
+                    <terminal x="0" y="-17" id="10" orientation="0"/>
+                    <terminal x="0" y="17" id="11" orientation="2"/>
                 </terminals>
                 <inputs>
-                    <input x="2.75" y="3" text="Lum" />
+                    <input x="2.75" y="3" text="Lum"/>
                 </inputs>
             </element>
-            <element x="50" y="60" type="common://protections/disjoncteurs_differentiels/ddr1.elmt" orientation="0" >
+            <element x="50" y="60" type="common://protections/disjoncteurs_differentiels/ddr1.elmt" orientation="0">
                 <terminals>
-                    <terminal x="0" y="-17" id="12" orientation="0" />
-                    <terminal x="0" y="17" id="13" orientation="2" />
+                    <terminal x="0" y="-17" id="12" orientation="0"/>
+                    <terminal x="0" y="17" id="13" orientation="2"/>
                 </terminals>
                 <inputs>
-                    <input x="5" y="-3" text="Distributeur" />
-                    <input x="9" y="14" text="500mA" />
+                    <input x="5" y="-3" text="Distributeur"/>
+                    <input x="9" y="14" text="500mA"/>
                 </inputs>
             </element>
-            <element x="50" y="140" type="common://protections/disjoncteurs_differentiels/ddr1.elmt" orientation="0" >
+            <element x="50" y="140" type="common://protections/disjoncteurs_differentiels/ddr1.elmt" orientation="0">
                 <terminals>
-                    <terminal x="0" y="-17" id="14" orientation="0" />
-                    <terminal x="0" y="17" id="15" orientation="2" />
+                    <terminal x="0" y="-17" id="14" orientation="0"/>
+                    <terminal x="0" y="17" id="15" orientation="2"/>
                 </terminals>
                 <inputs>
-                    <input x="5" y="-3" text="Salon" />
-                    <input x="9" y="14" text="30mA" />
+                    <input x="5" y="-3" text="Salon"/>
+                    <input x="9" y="14" text="30mA"/>
                 </inputs>
             </element>
-            <element x="150" y="140" type="common://protections/disjoncteurs_differentiels/ddr1.elmt" orientation="0" >
+            <element x="150" y="140" type="common://protections/disjoncteurs_differentiels/ddr1.elmt" orientation="0">
                 <terminals>
-                    <terminal x="0" y="-17" id="16" orientation="0" />
-                    <terminal x="0" y="17" id="17" orientation="2" />
+                    <terminal x="0" y="-17" id="16" orientation="0"/>
+                    <terminal x="0" y="17" id="17" orientation="2"/>
                 </terminals>
                 <inputs>
-                    <input x="5" y="-3" text="SDB" />
-                    <input x="9" y="14" text="30mA" />
+                    <input x="5" y="-3" text="SDB"/>
+                    <input x="9" y="14" text="30mA"/>
                 </inputs>
             </element>
-            <element x="650" y="140" type="common://protections/disjoncteurs_differentiels/ddr1.elmt" orientation="0" >
+            <element x="650" y="140" type="common://protections/disjoncteurs_differentiels/ddr1.elmt" orientation="0">
                 <terminals>
-                    <terminal x="0" y="-17" id="18" orientation="0" />
-                    <terminal x="0" y="17" id="19" orientation="2" />
+                    <terminal x="0" y="-17" id="18" orientation="0"/>
+                    <terminal x="0" y="17" id="19" orientation="2"/>
                 </terminals>
                 <inputs>
-                    <input x="5" y="-3" text="Chambre" />
-                    <input x="9" y="14" text="30mA" />
+                    <input x="5" y="-3" text="Chambre"/>
+                    <input x="9" y="14" text="30mA"/>
                 </inputs>
             </element>
-            <element x="300" y="140" type="common://protections/disjoncteurs_differentiels/ddr1.elmt" orientation="0" >
+            <element x="300" y="140" type="common://protections/disjoncteurs_differentiels/ddr1.elmt" orientation="0">
                 <terminals>
-                    <terminal x="0" y="-17" id="20" orientation="0" />
-                    <terminal x="0" y="17" id="21" orientation="2" />
+                    <terminal x="0" y="-17" id="20" orientation="0"/>
+                    <terminal x="0" y="17" id="21" orientation="2"/>
                 </terminals>
                 <inputs>
-                    <input x="5" y="-3" text="Cuisine" />
-                    <input x="9" y="14" text="30mA" />
+                    <input x="5" y="-3" text="Cuisine"/>
+                    <input x="9" y="14" text="30mA"/>
                 </inputs>
             </element>
-            <element x="750" y="150" type="common://protections/disjoncteurs/disjoncteur1.elmt" orientation="0" >
+            <element x="750" y="150" type="common://protections/disjoncteurs/disjoncteur1.elmt" orientation="0">
                 <terminals>
-                    <terminal x="0" y="-17" id="22" orientation="0" />
-                    <terminal x="0" y="17" id="23" orientation="2" />
+                    <terminal x="0" y="-17" id="22" orientation="0"/>
+                    <terminal x="0" y="17" id="23" orientation="2"/>
                 </terminals>
                 <inputs>
-                    <input x="2.75" y="3" text="Ent" />
+                    <input x="2.75" y="3" text="Ent"/>
                 </inputs>
             </element>
-            <element x="400" y="300" type="common://recepteurs/domestiques/lave_linge.elmt" orientation="0" >
+            <element x="400" y="300" type="common://recepteurs/domestiques/lave_linge.elmt" orientation="0">
                 <terminals>
-                    <terminal x="0" y="-8" id="24" orientation="0" />
+                    <terminal x="0" y="-8" id="24" orientation="0"/>
                 </terminals>
                 <inputs/>
             </element>
-            <element x="600" y="310" type="common://recepteurs/lampes/lampe1.elmt" orientation="0" >
+            <element x="600" y="310" type="common://recepteurs/lampes/lampe1.elmt" orientation="0">
                 <terminals>
-                    <terminal x="0" y="-17" id="25" orientation="0" />
+                    <terminal x="0" y="-17" id="25" orientation="0"/>
                 </terminals>
                 <inputs>
-                    <input x="15" y="3" text="" />
+                    <input x="15" y="3" text=""/>
                 </inputs>
             </element>
-            <element x="750" y="310" type="common://recepteurs/lampes/lampe1.elmt" orientation="0" >
+            <element x="750" y="310" type="common://recepteurs/lampes/lampe1.elmt" orientation="0">
                 <terminals>
-                    <terminal x="0" y="-17" id="26" orientation="0" />
+                    <terminal x="0" y="-17" id="26" orientation="0"/>
                 </terminals>
                 <inputs>
-                    <input x="15" y="3" text="" />
+                    <input x="15" y="3" text=""/>
                 </inputs>
             </element>
-            <element x="100" y="310" type="common://recepteurs/lampes/lampe1.elmt" orientation="0" >
+            <element x="100" y="310" type="common://recepteurs/lampes/lampe1.elmt" orientation="0">
                 <terminals>
-                    <terminal x="0" y="-17" id="27" orientation="0" />
+                    <terminal x="0" y="-17" id="27" orientation="0"/>
                 </terminals>
                 <inputs>
-                    <input x="15" y="3" text="" />
+                    <input x="15" y="3" text=""/>
                 </inputs>
             </element>
-            <element x="500" y="300" type="common://recepteurs/domestiques/four.elmt" orientation="0" >
+            <element x="500" y="300" type="common://recepteurs/domestiques/four.elmt" orientation="0">
                 <terminals>
-                    <terminal x="0" y="-8" id="28" orientation="0" />
+                    <terminal x="0" y="-8" id="28" orientation="0"/>
                 </terminals>
                 <inputs/>
             </element>
-            <element x="550" y="300" type="common://recepteurs/domestiques/plaque_cuisson.elmt" orientation="0" >
+            <element x="550" y="300" type="common://recepteurs/domestiques/plaque_cuisson.elmt" orientation="0">
                 <terminals>
-                    <terminal x="0" y="-8" id="29" orientation="0" />
+                    <terminal x="0" y="-8" id="29" orientation="0"/>
                 </terminals>
                 <inputs/>
             </element>
-            <element x="700" y="310" type="common://recepteurs/lampes/lampe1.elmt" orientation="0" >
+            <element x="700" y="310" type="common://recepteurs/lampes/lampe1.elmt" orientation="0">
                 <terminals>
-                    <terminal x="0" y="-17" id="30" orientation="0" />
+                    <terminal x="0" y="-17" id="30" orientation="0"/>
                 </terminals>
                 <inputs>
-                    <input x="15" y="3" text="" />
+                    <input x="15" y="3" text=""/>
                 </inputs>
             </element>
-            <element x="300" y="310" type="common://recepteurs/misc/pc.elmt" orientation="0" >
+            <element x="300" y="310" type="common://recepteurs/misc/pc.elmt" orientation="0">
                 <terminals>
-                    <terminal x="0" y="-17" id="31" orientation="0" />
+                    <terminal x="0" y="-17" id="31" orientation="0"/>
                 </terminals>
                 <inputs/>
             </element>
-            <element x="50" y="310" type="common://recepteurs/misc/pc.elmt" orientation="0" >
+            <element x="50" y="310" type="common://recepteurs/misc/pc.elmt" orientation="0">
                 <terminals>
-                    <terminal x="0" y="-17" id="32" orientation="0" />
+                    <terminal x="0" y="-17" id="32" orientation="0"/>
                 </terminals>
                 <inputs/>
             </element>
-            <element x="200" y="220" type="common://protections/disjoncteurs/disjoncteur1.elmt" orientation="0" >
+            <element x="200" y="220" type="common://protections/disjoncteurs/disjoncteur1.elmt" orientation="0">
                 <terminals>
-                    <terminal x="0" y="-17" id="33" orientation="0" />
-                    <terminal x="0" y="17" id="34" orientation="2" />
+                    <terminal x="0" y="-17" id="33" orientation="0"/>
+                    <terminal x="0" y="17" id="34" orientation="2"/>
                 </terminals>
                 <inputs>
-                    <input x="2.75" y="3" text="Lum" />
+                    <input x="2.75" y="3" text="Lum"/>
                 </inputs>
             </element>
-            <element x="250" y="220" type="common://protections/disjoncteurs/disjoncteur1.elmt" orientation="0" >
+            <element x="250" y="220" type="common://protections/disjoncteurs/disjoncteur1.elmt" orientation="0">
                 <terminals>
-                    <terminal x="0" y="-17" id="35" orientation="0" />
-                    <terminal x="0" y="17" id="36" orientation="2" />
+                    <terminal x="0" y="-17" id="35" orientation="0"/>
+                    <terminal x="0" y="17" id="36" orientation="2"/>
                 </terminals>
                 <inputs>
-                    <input x="2.75" y="3" text="Rad" />
+                    <input x="2.75" y="3" text="Rad"/>
                 </inputs>
             </element>
-            <element x="300" y="220" type="common://protections/disjoncteurs/disjoncteur1.elmt" orientation="0" >
+            <element x="300" y="220" type="common://protections/disjoncteurs/disjoncteur1.elmt" orientation="0">
                 <terminals>
-                    <terminal x="0" y="-17" id="37" orientation="0" />
-                    <terminal x="0" y="17" id="38" orientation="2" />
+                    <terminal x="0" y="-17" id="37" orientation="0"/>
+                    <terminal x="0" y="17" id="38" orientation="2"/>
                 </terminals>
                 <inputs>
-                    <input x="2.75" y="3" text="PC" />
+                    <input x="2.75" y="3" text="PC"/>
                 </inputs>
             </element>
-            <element x="350" y="220" type="common://protections/disjoncteurs/disjoncteur1.elmt" orientation="0" >
+            <element x="350" y="220" type="common://protections/disjoncteurs/disjoncteur1.elmt" orientation="0">
                 <terminals>
-                    <terminal x="0" y="-17" id="39" orientation="0" />
-                    <terminal x="0" y="17" id="40" orientation="2" />
+                    <terminal x="0" y="-17" id="39" orientation="0"/>
+                    <terminal x="0" y="17" id="40" orientation="2"/>
                 </terminals>
                 <inputs>
-                    <input x="2.75" y="3" text="Rad" />
+                    <input x="2.75" y="3" text="Rad"/>
                 </inputs>
             </element>
-            <element x="400" y="220" type="common://protections/disjoncteurs/disjoncteur1.elmt" orientation="0" >
+            <element x="400" y="220" type="common://protections/disjoncteurs/disjoncteur1.elmt" orientation="0">
                 <terminals>
-                    <terminal x="0" y="-17" id="41" orientation="0" />
-                    <terminal x="0" y="17" id="42" orientation="2" />
+                    <terminal x="0" y="-17" id="41" orientation="0"/>
+                    <terminal x="0" y="17" id="42" orientation="2"/>
                 </terminals>
                 <inputs>
-                    <input x="2.75" y="3" text="Linge" />
+                    <input x="2.75" y="3" text="Linge"/>
                 </inputs>
             </element>
-            <element x="450" y="220" type="common://protections/disjoncteurs/disjoncteur1.elmt" orientation="0" >
+            <element x="450" y="220" type="common://protections/disjoncteurs/disjoncteur1.elmt" orientation="0">
                 <terminals>
-                    <terminal x="0" y="-17" id="43" orientation="0" />
-                    <terminal x="0" y="17" id="44" orientation="2" />
+                    <terminal x="0" y="-17" id="43" orientation="0"/>
+                    <terminal x="0" y="17" id="44" orientation="2"/>
                 </terminals>
                 <inputs>
-                    <input x="2.75" y="3" text="Ves." />
+                    <input x="2.75" y="3" text="Ves."/>
                 </inputs>
             </element>
-            <element x="500" y="220" type="common://protections/disjoncteurs/disjoncteur1.elmt" orientation="0" >
+            <element x="500" y="220" type="common://protections/disjoncteurs/disjoncteur1.elmt" orientation="0">
                 <terminals>
-                    <terminal x="0" y="-17" id="45" orientation="0" />
-                    <terminal x="0" y="17" id="46" orientation="2" />
+                    <terminal x="0" y="-17" id="45" orientation="0"/>
+                    <terminal x="0" y="17" id="46" orientation="2"/>
                 </terminals>
                 <inputs>
-                    <input x="2.75" y="3" text="Four" />
+                    <input x="2.75" y="3" text="Four"/>
                 </inputs>
             </element>
-            <element x="550" y="220" type="common://protections/disjoncteurs/disjoncteur1.elmt" orientation="0" >
+            <element x="550" y="220" type="common://protections/disjoncteurs/disjoncteur1.elmt" orientation="0">
                 <terminals>
-                    <terminal x="0" y="-17" id="47" orientation="0" />
-                    <terminal x="0" y="17" id="48" orientation="2" />
+                    <terminal x="0" y="-17" id="47" orientation="0"/>
+                    <terminal x="0" y="17" id="48" orientation="2"/>
                 </terminals>
                 <inputs>
-                    <input x="2.75" y="3" text="Cuis." />
+                    <input x="2.75" y="3" text="Cuis."/>
                 </inputs>
             </element>
-            <element x="600" y="220" type="common://protections/disjoncteurs/disjoncteur1.elmt" orientation="0" >
+            <element x="600" y="220" type="common://protections/disjoncteurs/disjoncteur1.elmt" orientation="0">
                 <terminals>
-                    <terminal x="0" y="-17" id="49" orientation="0" />
-                    <terminal x="0" y="17" id="50" orientation="2" />
+                    <terminal x="0" y="-17" id="49" orientation="0"/>
+                    <terminal x="0" y="17" id="50" orientation="2"/>
                 </terminals>
                 <inputs>
-                    <input x="2.75" y="3" text="Lum" />
+                    <input x="2.75" y="3" text="Lum"/>
                 </inputs>
             </element>
-            <element x="650" y="220" type="common://protections/disjoncteurs/disjoncteur1.elmt" orientation="0" >
+            <element x="650" y="220" type="common://protections/disjoncteurs/disjoncteur1.elmt" orientation="0">
                 <terminals>
-                    <terminal x="0" y="-17" id="51" orientation="0" />
-                    <terminal x="0" y="17" id="52" orientation="2" />
+                    <terminal x="0" y="-17" id="51" orientation="0"/>
+                    <terminal x="0" y="17" id="52" orientation="2"/>
                 </terminals>
                 <inputs>
-                    <input x="2.75" y="3" text="PC" />
+                    <input x="2.75" y="3" text="PC"/>
                 </inputs>
             </element>
-            <element x="700" y="220" type="common://protections/disjoncteurs/disjoncteur1.elmt" orientation="0" >
+            <element x="700" y="220" type="common://protections/disjoncteurs/disjoncteur1.elmt" orientation="0">
                 <terminals>
-                    <terminal x="0" y="-17" id="53" orientation="0" />
-                    <terminal x="0" y="17" id="54" orientation="2" />
+                    <terminal x="0" y="-17" id="53" orientation="0"/>
+                    <terminal x="0" y="17" id="54" orientation="2"/>
                 </terminals>
                 <inputs>
-                    <input x="2.75" y="3" text="Lum" />
+                    <input x="2.75" y="3" text="Lum"/>
                 </inputs>
             </element>
         </elements>
         <conductors>
-            <conductor neutral="true" phase="1" terminal1="11" ground="true" terminal2="27" type="single" />
-            <conductor neutral="true" phase="1" terminal1="7" ground="true" terminal2="32" type="single" />
-            <conductor neutral="true" phase="1" terminal1="6" ground="true" terminal2="10" type="single" />
-            <conductor neutral="true" phase="1" terminal1="23" ground="true" terminal2="26" type="single" />
-            <conductor neutral="true" phase="1" terminal1="15" ground="true" terminal2="6" type="single" />
-            <conductor neutral="true" phase="1" terminal1="13" ground="true" terminal2="14" type="single" />
-            <conductor neutral="true" phase="1" terminal1="16" ground="true" terminal2="20" type="single" />
-            <conductor neutral="true" phase="1" terminal1="13" ground="true" terminal2="16" type="single" >
-                <segment length="6.5" orientation="vertical" />
-                <segment length="22.5" orientation="vertical" />
-                <segment length="100" orientation="horizontal" />
-                <segment length="2.5" orientation="vertical" />
-                <segment length="6.5" orientation="vertical" />
+            <conductor neutral="true" phase="1" terminal1="11" ground="true" terminal2="27" type="single"/>
+            <conductor neutral="true" phase="1" terminal1="7" ground="true" terminal2="32" type="single"/>
+            <conductor neutral="true" phase="1" terminal1="6" ground="true" terminal2="10" type="single"/>
+            <conductor neutral="true" phase="1" terminal1="23" ground="true" terminal2="26" type="single"/>
+            <conductor neutral="true" phase="1" terminal1="15" ground="true" terminal2="6" type="single"/>
+            <conductor neutral="true" phase="1" terminal1="13" ground="true" terminal2="14" type="single"/>
+            <conductor neutral="true" phase="1" terminal1="16" ground="true" terminal2="20" type="single"/>
+            <conductor neutral="true" phase="1" terminal1="13" ground="true" terminal2="16" type="single">
+                <segment length="6.5" orientation="vertical"/>
+                <segment length="22.5" orientation="vertical"/>
+                <segment length="100" orientation="horizontal"/>
+                <segment length="2.5" orientation="vertical"/>
+                <segment length="6.5" orientation="vertical"/>
             </conductor>
-            <conductor neutral="true" phase="1" terminal1="20" ground="true" terminal2="18" type="single" />
-            <conductor neutral="true" phase="1" terminal1="18" ground="true" terminal2="22" type="single" >
-                <segment length="-6.5" orientation="vertical" />
-                <segment length="-2.5" orientation="vertical" />
-                <segment length="100" orientation="horizontal" />
-                <segment length="7.5" orientation="vertical" />
-                <segment length="11.5" orientation="vertical" />
+            <conductor neutral="true" phase="1" terminal1="20" ground="true" terminal2="18" type="single"/>
+            <conductor neutral="true" phase="1" terminal1="18" ground="true" terminal2="22" type="single">
+                <segment length="-6.5" orientation="vertical"/>
+                <segment length="-2.5" orientation="vertical"/>
+                <segment length="100" orientation="horizontal"/>
+                <segment length="7.5" orientation="vertical"/>
+                <segment length="11.5" orientation="vertical"/>
             </conductor>
-            <conductor neutral="true" phase="1" terminal1="17" ground="true" terminal2="0" type="single" />
-            <conductor neutral="true" phase="1" terminal1="1" ground="true" terminal2="9" type="single" />
-            <conductor neutral="true" phase="1" terminal1="0" ground="true" terminal2="33" type="single" />
-            <conductor neutral="true" phase="1" terminal1="34" ground="true" terminal2="5" type="single" />
-            <conductor neutral="true" phase="1" terminal1="33" ground="true" terminal2="35" type="single" />
-            <conductor neutral="true" phase="1" terminal1="4" ground="true" terminal2="36" type="single" />
-            <conductor neutral="true" phase="1" terminal1="21" ground="true" terminal2="37" type="single" />
-            <conductor neutral="true" phase="1" terminal1="37" ground="true" terminal2="39" type="single" />
-            <conductor neutral="true" phase="1" terminal1="39" ground="true" terminal2="41" type="single" />
-            <conductor neutral="true" phase="1" terminal1="41" ground="true" terminal2="43" type="single" />
-            <conductor neutral="true" phase="1" terminal1="43" ground="true" terminal2="45" type="single" />
-            <conductor neutral="true" phase="1" terminal1="45" ground="true" terminal2="47" type="single" />
-            <conductor neutral="true" phase="1" terminal1="47" ground="true" terminal2="49" type="single" />
-            <conductor neutral="true" phase="1" terminal1="19" ground="true" terminal2="51" type="single" />
-            <conductor neutral="true" phase="1" terminal1="51" ground="true" terminal2="53" type="single" />
-            <conductor neutral="true" phase="1" terminal1="38" ground="true" terminal2="31" type="single" />
-            <conductor neutral="true" phase="1" terminal1="3" ground="true" terminal2="40" type="single" />
-            <conductor neutral="true" phase="1" terminal1="24" ground="true" terminal2="42" type="single" />
-            <conductor neutral="true" phase="1" terminal1="8" ground="true" terminal2="44" type="single" />
-            <conductor neutral="true" phase="1" terminal1="28" ground="true" terminal2="46" type="single" />
-            <conductor neutral="true" phase="1" terminal1="29" ground="true" terminal2="48" type="single" />
-            <conductor neutral="true" phase="1" terminal1="50" ground="true" terminal2="25" type="single" />
-            <conductor neutral="true" phase="1" terminal1="52" ground="true" terminal2="2" type="single" />
-            <conductor neutral="true" phase="1" terminal1="54" ground="true" terminal2="30" type="single" />
+            <conductor neutral="true" phase="1" terminal1="17" ground="true" terminal2="0" type="single"/>
+            <conductor neutral="true" phase="1" terminal1="1" ground="true" terminal2="9" type="single"/>
+            <conductor neutral="true" phase="1" terminal1="0" ground="true" terminal2="33" type="single"/>
+            <conductor neutral="true" phase="1" terminal1="34" ground="true" terminal2="5" type="single"/>
+            <conductor neutral="true" phase="1" terminal1="33" ground="true" terminal2="35" type="single"/>
+            <conductor neutral="true" phase="1" terminal1="4" ground="true" terminal2="36" type="single"/>
+            <conductor neutral="true" phase="1" terminal1="21" ground="true" terminal2="37" type="single"/>
+            <conductor neutral="true" phase="1" terminal1="37" ground="true" terminal2="39" type="single"/>
+            <conductor neutral="true" phase="1" terminal1="39" ground="true" terminal2="41" type="single"/>
+            <conductor neutral="true" phase="1" terminal1="41" ground="true" terminal2="43" type="single"/>
+            <conductor neutral="true" phase="1" terminal1="43" ground="true" terminal2="45" type="single"/>
+            <conductor neutral="true" phase="1" terminal1="45" ground="true" terminal2="47" type="single"/>
+            <conductor neutral="true" phase="1" terminal1="47" ground="true" terminal2="49" type="single"/>
+            <conductor neutral="true" phase="1" terminal1="19" ground="true" terminal2="51" type="single"/>
+            <conductor neutral="true" phase="1" terminal1="51" ground="true" terminal2="53" type="single"/>
+            <conductor neutral="true" phase="1" terminal1="38" ground="true" terminal2="31" type="single"/>
+            <conductor neutral="true" phase="1" terminal1="3" ground="true" terminal2="40" type="single"/>
+            <conductor neutral="true" phase="1" terminal1="24" ground="true" terminal2="42" type="single"/>
+            <conductor neutral="true" phase="1" terminal1="8" ground="true" terminal2="44" type="single"/>
+            <conductor neutral="true" phase="1" terminal1="28" ground="true" terminal2="46" type="single"/>
+            <conductor neutral="true" phase="1" terminal1="29" ground="true" terminal2="48" type="single"/>
+            <conductor neutral="true" phase="1" terminal1="50" ground="true" terminal2="25" type="single"/>
+            <conductor neutral="true" phase="1" terminal1="52" ground="true" terminal2="2" type="single"/>
+            <conductor neutral="true" phase="1" terminal1="54" ground="true" terminal2="30" type="single"/>
         </conductors>
     </diagram>
     <collection/>