diff --git a/elements/contacts/interrupteurs/foot_no_nc.elmt b/elements/contacts/interrupteurs/foot_no_nc.elmt
index c1401cb8a..ffc0af2a0 100644
--- a/elements/contacts/interrupteurs/foot_no_nc.elmt
+++ b/elements/contacts/interrupteurs/foot_no_nc.elmt
@@ -1,4 +1,4 @@
-<definition width="80" version="0.22" hotspot_x="30" hotspot_y="25" height="50" type="element" orientation="dnny">
+<definition width="80" version="0.3" hotspot_x="30" hotspot_y="25" height="50" type="element" orientation="dnny">
     <names>
         <name lang="en">Interrupteur a pedale (NO/NC)</name>
         <name lang="pl">Łącznik wielozestykowy napędzany nogą</name>
@@ -6,13 +6,13 @@
     <informations>Author: The QElectroTech team&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <input x="-4.5" y="-7" size="5" rotate="true" text="13"/>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="2" x1="-19" y2="-4" x2="-13" y3="4" x3="-13"/>
-        <input x="15.5" y="-8" size="5" rotate="true" text="21"/>
-        <input x="15.5" y="23" size="5" rotate="true" text="22"/>
-        <input x="-4.5" y="24" size="5" rotate="true" text="14"/>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="20" x1="20" y2="10" x2="20" y3="-10" x3="26"/>
         <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="20" y2="-9" x2="27"/>
+        <input x="-2" y="-14.5" size="5" rotate="true" text="13"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="2" x1="-19" y2="-4" x2="-13" y3="4" x3="-13"/>
+        <input x="17" y="-14.5" size="5" rotate="true" text="21"/>
+        <input x="18" y="17.5" size="5" rotate="true" text="22"/>
+        <input x="-2" y="17.5" size="5" rotate="true" text="14"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="20" x1="20" y2="10" x2="20" y3="-10" x3="26"/>
         <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="0" x1="-13" y2="0" x2="23"/>
         <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="-20" x1="20" y2="-9" x2="20"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="20" x1="0" y2="10" x2="0" y3="-10" x3="-6"/>
diff --git a/elements/references/ref_coi_hor.elmt b/elements/references/ref_bobine_2_h.elmt
similarity index 95%
rename from elements/references/ref_coi_hor.elmt
rename to elements/references/ref_bobine_2_h.elmt
index 987121933..5c70b87af 100644
--- a/elements/references/ref_coi_hor.elmt
+++ b/elements/references/ref_bobine_2_h.elmt
@@ -1,13 +1,14 @@
-<definition width="20" version="0.3" hotspot_x="15" hotspot_y="30" height="30" type="element" orientation="dyyy">
-    <names>
-        <name lang="en">Reference coil (horizontal)</name>
-        <name lang="pl">Odsyłacz - cewka (poziomo)</name>
-    </names>
-    <informations></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="-17.05" x1="-9.99997" y2="-19.05" x2="-9.99997"/>
-        <rect width="6" x="-13" y="-17.05" antialias="false" height="4" style="line-style:normal;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="-12.05" x1="-9.99997" y2="-11.05" x2="-9.99997"/>
-        <input x="-8" y="-14.5" size="5" rotate="true" text="/"/>
-    </description>
-</definition>
+<definition width="20" version="0.3" hotspot_x="15" hotspot_y="30" height="30" type="element" orientation="dyyy">
+    <names>
+        <name lang="en">Reference coil (horizontal)</name>
+        <name lang="fr">Reference bobine h</name>
+        <name lang="pl">Odsyłacz - cewka (poziomo)</name>
+    </names>
+    <informations></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="-17.05" x1="-9.99997" y2="-19.05" x2="-9.99997"/>
+        <rect width="6" x="-13" y="-17.05" antialias="false" height="4" style="line-style:normal;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="-12.05" x1="-9.99997" y2="-11.05" x2="-9.99997"/>
+        <input x="-8" y="-14.5" size="5" rotate="true" text="/"/>
+    </description>
+</definition>
diff --git a/elements/references/ref_coi_ver.elmt b/elements/references/ref_bobine_2_v.elmt
similarity index 95%
rename from elements/references/ref_coi_ver.elmt
rename to elements/references/ref_bobine_2_v.elmt
index 13c87b6f9..49e7a671f 100644
--- a/elements/references/ref_coi_ver.elmt
+++ b/elements/references/ref_bobine_2_v.elmt
@@ -1,13 +1,14 @@
-<definition width="20" version="0.3" hotspot_x="15" hotspot_y="30" height="30" type="element" orientation="dyyy">
-    <names>
-        <name lang="en">Reference coil (vertical)</name>
-        <name lang="pl">Odsyłacz - cewka (pionowo)</name>
-    </names>
-    <informations></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="-24" x1="-7.03337" y2="-26" x2="-7.03337"/>
-        <rect width="6" x="-10.0334" y="-24" antialias="false" height="4" style="line-style:normal;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="-19" x1="-7.03337" y2="-18" x2="-7.03337"/>
-        <input x="-14.0334" y="-13.5" size="5" rotate="true" text="/"/>
-    </description>
-</definition>
+<definition width="20" version="0.3" hotspot_x="15" hotspot_y="30" height="30" type="element" orientation="dyyy">
+    <names>
+        <name lang="en">Reference coil (vertical)</name>
+        <name lang="fr">Reference bobine v</name>
+        <name lang="pl">Odsyłacz - cewka (pionowo)</name>
+    </names>
+    <informations></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="-24" x1="-7.03337" y2="-26" x2="-7.03337"/>
+        <rect width="6" x="-10.0334" y="-24" antialias="false" height="4" style="line-style:normal;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="-19" x1="-7.03337" y2="-18" x2="-7.03337"/>
+        <input x="-14.0334" y="-13.5" size="5" rotate="true" text="/"/>
+    </description>
+</definition>
diff --git a/elements/references/odnosnik_4_h.elmt b/elements/references/ref_bobine_h.elmt
similarity index 78%
rename from elements/references/odnosnik_4_h.elmt
rename to elements/references/ref_bobine_h.elmt
index 84df38f3a..bca45e11c 100644
--- a/elements/references/odnosnik_4_h.elmt
+++ b/elements/references/ref_bobine_h.elmt
@@ -1,12 +1,14 @@
-<definition width="20" version="0.22" hotspot_x="15" hotspot_y="30" height="30" type="element" orientation="dyyy">
-    <names>
-        <name lang="pl">Odsyłacz_4 (poziomo)</name>
-    </names>
-    <informations></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="-17.05" x1="-9.99997" y2="-19.05" x2="-9.99997"/>
-        <rect width="6" x="-13" y="-17.05" antialias="false" height="4" style="line-style:normal;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="-12.05" x1="-9.99997" y2="-11.05" x2="-9.99997"/>
-        <input x="-8" y="-14.5" size="5" rotate="true" text="_"/>
-    </description>
-</definition>
+<definition width="20" version="0.3" hotspot_x="15" hotspot_y="30" height="30" type="element" orientation="dyyy">
+    <names>
+        <name lang="en">Reference coil h</name>
+        <name lang="fr">Reference bobine h</name>
+        <name lang="pl">Odsyłacz_4 (poziomo)</name>
+    </names>
+    <informations></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="-17.05" x1="-9.99997" y2="-19.05" x2="-9.99997"/>
+        <rect width="6" x="-13" y="-17.05" antialias="false" height="4" style="line-style:normal;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="-12.05" x1="-9.99997" y2="-11.05" x2="-9.99997"/>
+        <input x="-8" y="-14.5" size="5" rotate="true" text="_"/>
+    </description>
+</definition>
diff --git a/elements/references/odnosnik_4_v.elmt b/elements/references/ref_bobine_v.elmt
similarity index 78%
rename from elements/references/odnosnik_4_v.elmt
rename to elements/references/ref_bobine_v.elmt
index 28bc13c49..e9033248d 100644
--- a/elements/references/odnosnik_4_v.elmt
+++ b/elements/references/ref_bobine_v.elmt
@@ -1,12 +1,14 @@
-<definition width="20" version="0.22" hotspot_x="15" hotspot_y="30" height="30" type="element" orientation="dyyy">
-    <names>
-        <name lang="pl">Odsyłacz_4 (pionowo)</name>
-    </names>
-    <informations></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="-24" x1="-7.03337" y2="-26" x2="-7.03337"/>
-        <rect width="6" x="-10.0334" y="-24" antialias="false" height="4" style="line-style:normal;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="-19" x1="-7.03337" y2="-18" x2="-7.03337"/>
-        <input x="-14.0334" y="-13.5" size="5" rotate="true" text="_"/>
-    </description>
-</definition>
+<definition width="20" version="0.3" hotspot_x="15" hotspot_y="30" height="30" type="element" orientation="dyyy">
+    <names>
+        <name lang="en">Reference coil v</name>
+        <name lang="fr">Reference bobine v</name>
+        <name lang="pl">Odsyłacz_4 (pionowo)</name>
+    </names>
+    <informations></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="-24" x1="-7.03337" y2="-26" x2="-7.03337"/>
+        <rect width="6" x="-10.0334" y="-24" antialias="false" height="4" style="line-style:normal;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="-19" x1="-7.03337" y2="-18" x2="-7.03337"/>
+        <input x="-14.0334" y="-13.5" size="5" rotate="true" text="_"/>
+    </description>
+</definition>
diff --git a/elements/references/ref_nc_hor.elmt b/elements/references/ref_contact_2_nc_h.elmt
similarity index 94%
rename from elements/references/ref_nc_hor.elmt
rename to elements/references/ref_contact_2_nc_h.elmt
index a3cb5c9d2..868c47269 100644
--- a/elements/references/ref_nc_hor.elmt
+++ b/elements/references/ref_contact_2_nc_h.elmt
@@ -1,13 +1,14 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="30" height="30" type="element" orientation="dyyy">
-    <names>
-        <name lang="en">Reference contact NC (horizontal)</name>
-        <name lang="pl">Odsyłacz - zestyk rozwierny (poziomo)</name>
-    </names>
-    <informations></informations>
-    <description>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-17" x1="-8" y2="-15" x2="0" y3="-15" x3="3"/>
-        <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="-17" x1="-8" y2="-16" 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="-15" x1="-10" y2="-15" x2="-8"/>
-        <input x="2" y="-15.5" size="5" rotate="true" text="/"/>
-    </description>
-</definition>
+<definition width="30" version="0.3" hotspot_x="15" hotspot_y="30" height="30" type="element" orientation="dyyy">
+    <names>
+        <name lang="en">Reference contact NC (horizontal)</name>
+        <name lang="fr">Reference contact NC h</name>
+        <name lang="pl">Odsyłacz - zestyk rozwierny (poziomo)</name>
+    </names>
+    <informations></informations>
+    <description>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-17" x1="-8" y2="-15" x2="0" y3="-15" x3="3"/>
+        <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="-17" x1="-8" y2="-16" 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="-15" x1="-10" y2="-15" x2="-8"/>
+        <input x="2" y="-15.5" size="5" rotate="true" text="/"/>
+    </description>
+</definition>
diff --git a/elements/references/ref_nc_ver.elmt b/elements/references/ref_contact_2_nc_v.elmt
similarity index 94%
rename from elements/references/ref_nc_ver.elmt
rename to elements/references/ref_contact_2_nc_v.elmt
index 5f1cf6f64..57de4debf 100644
--- a/elements/references/ref_nc_ver.elmt
+++ b/elements/references/ref_contact_2_nc_v.elmt
@@ -1,13 +1,14 @@
-<definition width="20" version="0.3" hotspot_x="15" hotspot_y="20" height="20" type="element" orientation="dyyy">
-    <names>
-        <name lang="en">Reference contact NC (vertical)</name>
-        <name lang="pl">Odsyłacz - zestyk rozwierny (pionowo)</name>
-    </names>
-    <informations></informations>
-    <description>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-17" x1="-8" y2="-15" x2="0" y3="-15" x3="3"/>
-        <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="-17" x1="-8" y2="-16" 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="-15" x1="-10" y2="-15" x2="-8"/>
-        <input x="-14" y="-7.5" size="5" rotate="true" text="/"/>
-    </description>
-</definition>
+<definition width="20" version="0.3" hotspot_x="15" hotspot_y="20" height="20" type="element" orientation="dyyy">
+    <names>
+        <name lang="en">Reference contact NC (vertical)</name>
+        <name lang="fr">Reference contact NC v</name>
+        <name lang="pl">Odsyłacz - zestyk rozwierny (pionowo)</name>
+    </names>
+    <informations></informations>
+    <description>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-17" x1="-8" y2="-15" x2="0" y3="-15" x3="3"/>
+        <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="-17" x1="-8" y2="-16" 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="-15" x1="-10" y2="-15" x2="-8"/>
+        <input x="-14" y="-7.5" size="5" rotate="true" text="/"/>
+    </description>
+</definition>
diff --git a/elements/references/ref_no_hor.elmt b/elements/references/ref_contact_2_no_h.elmt
similarity index 93%
rename from elements/references/ref_no_hor.elmt
rename to elements/references/ref_contact_2_no_h.elmt
index 71e59080e..7972b56f5 100644
--- a/elements/references/ref_no_hor.elmt
+++ b/elements/references/ref_contact_2_no_h.elmt
@@ -1,12 +1,13 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="30" height="30" type="element" orientation="dyyy">
-    <names>
-        <name lang="en">Reference contact NO (horizontal)</name>
-        <name lang="pl">Odsyłacz - zestyk zwierny (poziomo)</name>
-    </names>
-    <informations></informations>
-    <description>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-13" x1="-8" y2="-15" x2="0" y3="-15" x3="3"/>
-        <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="-15" x1="-10" y2="-15" x2="-8"/>
-        <input x="2" y="-15.5" size="5" rotate="true" text="/"/>
-    </description>
-</definition>
+<definition width="30" version="0.3" hotspot_x="15" hotspot_y="30" height="30" type="element" orientation="dyyy">
+    <names>
+        <name lang="en">Reference contact NO (horizontal)</name>
+        <name lang="fr">Reference contact NO h</name>
+        <name lang="pl">Odsyłacz - zestyk zwierny (poziomo)</name>
+    </names>
+    <informations></informations>
+    <description>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-13" x1="-8" y2="-15" x2="0" y3="-15" x3="3"/>
+        <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="-15" x1="-10" y2="-15" x2="-8"/>
+        <input x="2" y="-15.5" size="5" rotate="true" text="/"/>
+    </description>
+</definition>
diff --git a/elements/references/ref_no_ver.elmt b/elements/references/ref_contact_2_no_v.elmt
similarity index 93%
rename from elements/references/ref_no_ver.elmt
rename to elements/references/ref_contact_2_no_v.elmt
index e9dde2484..8b5d3946f 100644
--- a/elements/references/ref_no_ver.elmt
+++ b/elements/references/ref_contact_2_no_v.elmt
@@ -1,12 +1,13 @@
-<definition width="20" version="0.3" hotspot_x="15" hotspot_y="20" height="20" type="element" orientation="dyyy">
-    <names>
-        <name lang="en">Reference contact NO (vertical)</name>
-        <name lang="pl">Odsyłacz - zestyk zwierny (poziomo)</name>
-    </names>
-    <informations></informations>
-    <description>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-13" x1="-8" y2="-15" x2="0" y3="-15" x3="3"/>
-        <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="-15" x1="-10" y2="-15" x2="-8"/>
-        <input x="-14" y="-7.5" size="5" rotate="true" text="/"/>
-    </description>
-</definition>
+<definition width="20" version="0.3" hotspot_x="15" hotspot_y="20" height="20" type="element" orientation="dyyy">
+    <names>
+        <name lang="en">Reference contact NO (vertical)</name>
+        <name lang="fr">Reference contact NO v</name>
+        <name lang="pl">Odsyłacz - zestyk zwierny (poziomo)</name>
+    </names>
+    <informations></informations>
+    <description>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-13" x1="-8" y2="-15" x2="0" y3="-15" x3="3"/>
+        <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="-15" x1="-10" y2="-15" x2="-8"/>
+        <input x="-14" y="-7.5" size="5" rotate="true" text="/"/>
+    </description>
+</definition>
diff --git a/elements/references/odnosnik_2_h.elmt b/elements/references/ref_contact_nc_h.elmt
similarity index 77%
rename from elements/references/odnosnik_2_h.elmt
rename to elements/references/ref_contact_nc_h.elmt
index 5b4ba028e..e4eb830fa 100644
--- a/elements/references/odnosnik_2_h.elmt
+++ b/elements/references/ref_contact_nc_h.elmt
@@ -1,12 +1,14 @@
-<definition width="30" version="0.22" hotspot_x="15" hotspot_y="30" height="30" type="element" orientation="dyyy">
-    <names>
-        <name lang="pl">Odsyłacz_2 (poziomo)</name>
-    </names>
-    <informations></informations>
-    <description>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-17" x1="-8" y2="-15" x2="0" y3="-15" x3="3"/>
-        <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="-17" x1="-8" y2="-16" 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="-15" x1="-10" y2="-15" x2="-8"/>
-        <input x="2" y="-15.5" size="5" rotate="true" text="_"/>
-    </description>
-</definition>
+<definition width="30" version="0.3" hotspot_x="15" hotspot_y="30" height="30" type="element" orientation="dyyy">
+    <names>
+        <name lang="en">Reference contact NC h</name>
+        <name lang="fr">Reference contact NC h</name>
+        <name lang="pl">Odsyłacz_2 (poziomo)</name>
+    </names>
+    <informations></informations>
+    <description>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-17" x1="-8" y2="-15" x2="0" y3="-15" x3="3"/>
+        <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="-17" x1="-8" y2="-16" 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="-15" x1="-10" y2="-15" x2="-8"/>
+        <input x="2" y="-15.5" size="5" rotate="true" text="_"/>
+    </description>
+</definition>
diff --git a/elements/references/odnosnik_2_v.elmt b/elements/references/ref_contact_nc_v.elmt
similarity index 77%
rename from elements/references/odnosnik_2_v.elmt
rename to elements/references/ref_contact_nc_v.elmt
index cbc19bbd5..7c8a02945 100644
--- a/elements/references/odnosnik_2_v.elmt
+++ b/elements/references/ref_contact_nc_v.elmt
@@ -1,12 +1,14 @@
-<definition width="20" version="0.22" hotspot_x="15" hotspot_y="20" height="20" type="element" orientation="dyyy">
-    <names>
-        <name lang="pl">Odsyłacz_2 (pionowo)</name>
-    </names>
-    <informations></informations>
-    <description>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-17" x1="-8" y2="-15" x2="0" y3="-15" x3="3"/>
-        <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="-17" x1="-8" y2="-16" 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="-15" x1="-10" y2="-15" x2="-8"/>
-        <input x="-14" y="-7.5" size="5" rotate="true" text="_"/>
-    </description>
-</definition>
+<definition width="20" version="0.3" hotspot_x="15" hotspot_y="20" height="20" type="element" orientation="dyyy">
+    <names>
+        <name lang="en">Reference contact NC h</name>
+        <name lang="fr">Reference contact NC h</name>
+        <name lang="pl">Odsyłacz_2 (pionowo)</name>
+    </names>
+    <informations></informations>
+    <description>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-17" x1="-8" y2="-15" x2="0" y3="-15" x3="3"/>
+        <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="-17" x1="-8" y2="-16" 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="-15" x1="-10" y2="-15" x2="-8"/>
+        <input x="-14" y="-7.5" size="5" rotate="true" text="_"/>
+    </description>
+</definition>
diff --git a/elements/references/odnosnik_1_h.elmt b/elements/references/ref_contact_no_h.elmt
similarity index 72%
rename from elements/references/odnosnik_1_h.elmt
rename to elements/references/ref_contact_no_h.elmt
index 3c8777cd4..428f0c40d 100644
--- a/elements/references/odnosnik_1_h.elmt
+++ b/elements/references/ref_contact_no_h.elmt
@@ -1,11 +1,13 @@
-<definition width="30" version="0.22" hotspot_x="15" hotspot_y="30" height="30" type="element" orientation="dyyy">
-    <names>
-        <name lang="pl">Odsyłacz_1 (poziomo)</name>
-    </names>
-    <informations></informations>
-    <description>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-13" x1="-8" y2="-15" x2="0" y3="-15" x3="3"/>
-        <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="-15" x1="-10" y2="-15" x2="-8"/>
-        <input x="2" y="-15.5" size="5" rotate="true" text="_"/>
-    </description>
-</definition>
+<definition width="30" version="0.3" hotspot_x="15" hotspot_y="30" height="30" type="element" orientation="dyyy">
+    <names>
+        <name lang="en">Reference contact NO h</name>
+        <name lang="fr">Reference contact NO h</name>
+        <name lang="pl">Odsyłacz_1 (poziomo)</name>
+    </names>
+    <informations></informations>
+    <description>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-13" x1="-8" y2="-15" x2="0" y3="-15" x3="3"/>
+        <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="-15" x1="-10" y2="-15" x2="-8"/>
+        <input x="2" y="-15.5" size="5" rotate="true" text="_"/>
+    </description>
+</definition>
diff --git a/elements/references/odnosnik_1_v.elmt b/elements/references/ref_contact_no_v.elmt
similarity index 72%
rename from elements/references/odnosnik_1_v.elmt
rename to elements/references/ref_contact_no_v.elmt
index d19b92890..c4bb9aca9 100644
--- a/elements/references/odnosnik_1_v.elmt
+++ b/elements/references/ref_contact_no_v.elmt
@@ -1,11 +1,13 @@
-<definition width="20" version="0.22" hotspot_x="15" hotspot_y="20" height="20" type="element" orientation="dyyy">
-    <names>
-        <name lang="pl">Odsyłacz_1 (pionowo)</name>
-    </names>
-    <informations></informations>
-    <description>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-13" x1="-8" y2="-15" x2="0" y3="-15" x3="3"/>
-        <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="-15" x1="-10" y2="-15" x2="-8"/>
-        <input x="-14" y="-7.5" size="5" rotate="true" text="_"/>
-    </description>
-</definition>
+<definition width="20" version="0.3" hotspot_x="15" hotspot_y="20" height="20" type="element" orientation="dyyy">
+    <names>
+        <name lang="en">Reference contact NO h</name>
+        <name lang="fr">Reference contact NO h</name>
+        <name lang="pl">Odsyłacz_1 (pionowo)</name>
+    </names>
+    <informations></informations>
+    <description>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-13" x1="-8" y2="-15" x2="0" y3="-15" x3="3"/>
+        <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="-15" x1="-10" y2="-15" x2="-8"/>
+        <input x="-14" y="-7.5" size="5" rotate="true" text="_"/>
+    </description>
+</definition>
diff --git a/elements/references/strona_p.elmt b/elements/references/ref_folio_precedent.elmt
similarity index 93%
rename from elements/references/strona_p.elmt
rename to elements/references/ref_folio_precedent.elmt
index b019b29ca..0bbb30d8a 100644
--- a/elements/references/strona_p.elmt
+++ b/elements/references/ref_folio_precedent.elmt
@@ -1,14 +1,15 @@
-<definition width="50" version="0.3" hotspot_x="35" hotspot_y="20" height="40" type="element" orientation="dyyy">
-    <names>
-        <name lang="en">Previous folio</name>
-        <name lang="it">Foglio precedente</name>
-        <name lang="pl">Wejście adresowe</name>
-    </names>
-    <informations></informations>
-    <description>
-        <polygon x4="-1" antialias="true" style="line-style:normal;line-weight:normal;filling:black;color:black" closed="false" y1="-4" x1="-1" y2="4" x2="-1" y3="0" x3="9" y4="-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="9" y2="0" x2="12"/>
-        <input x="-31" y="0.5" size="9" text="/"/>
-        <terminal x="13" y="0" orientation="e"/>
-    </description>
-</definition>
+<definition width="50" version="0.3" hotspot_x="35" hotspot_y="20" height="40" type="element" orientation="dyyy">
+    <names>
+        <name lang="en">Previous folio</name>
+        <name lang="it">Foglio precedente</name>
+        <name lang="fr">Reference folio precedent</name>
+        <name lang="pl">Wejście adresowe</name>
+    </names>
+    <informations></informations>
+    <description>
+        <polygon x4="-1" antialias="true" style="line-style:normal;line-weight:normal;filling:black;color:black" closed="false" y1="-4" x1="-1" y2="4" x2="-1" y3="0" x3="9" y4="-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="9" y2="0" x2="12"/>
+        <input x="-31" y="0.5" size="9" text="/"/>
+        <terminal x="13" y="0" orientation="e"/>
+    </description>
+</definition>
diff --git a/elements/references/strona_n.elmt b/elements/references/ref_folio_suivant.elmt
similarity index 93%
rename from elements/references/strona_n.elmt
rename to elements/references/ref_folio_suivant.elmt
index 89289f141..f2f657f3a 100644
--- a/elements/references/strona_n.elmt
+++ b/elements/references/ref_folio_suivant.elmt
@@ -1,13 +1,14 @@
-<definition width="40" version="0.3" hotspot_x="15" hotspot_y="20" height="40" type="element" orientation="dyyy">
-    <names>
-        <name lang="en">Next folio</name>
-        <name lang="pl">Wyjście adresowe</name>
-    </names>
-    <informations></informations>
-    <description>
-        <polygon x4="-9" antialias="true" style="line-style:normal;line-weight:normal;filling:black;color:black" closed="false" y1="-4" x1="-9" y2="4" x2="-9" y3="0" x3="2" y4="-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="-9" y2="0" x2="-12"/>
-        <input x="6" y="0.5" size="9" text="/"/>
-        <terminal x="-13" y="0" orientation="w"/>
-    </description>
-</definition>
+<definition width="40" version="0.3" hotspot_x="15" hotspot_y="20" height="40" type="element" orientation="dyyy">
+    <names>
+        <name lang="en">Next folio</name>
+        <name lang="fr">Reference folio suivant</name>
+        <name lang="pl">Wyjście adresowe</name>
+    </names>
+    <informations></informations>
+    <description>
+        <polygon x4="-9" antialias="true" style="line-style:normal;line-weight:normal;filling:black;color:black" closed="false" y1="-4" x1="-9" y2="4" x2="-9" y3="0" x3="2" y4="-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="-9" y2="0" x2="-12"/>
+        <input x="6" y="0.5" size="9" text="/"/>
+        <terminal x="-13" y="0" orientation="w"/>
+    </description>
+</definition>
diff --git a/elements/references/ref_lig_hor.elmt b/elements/references/ref_voyant_2_h.elmt
similarity index 95%
rename from elements/references/ref_lig_hor.elmt
rename to elements/references/ref_voyant_2_h.elmt
index 3134fdca8..d58db01a0 100644
--- a/elements/references/ref_lig_hor.elmt
+++ b/elements/references/ref_voyant_2_h.elmt
@@ -1,13 +1,14 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="30" height="30" type="element" orientation="dyyy">
-    <names>
-        <name lang="en">Reference light (horizontal)</name>
-        <name lang="pl">Odsyłacz - lampka sygnalizacyjna (poziomo)</name>
-    </names>
-    <informations></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="-13" x1="-7" y2="-17" x2="-3"/>
-        <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="-17" x1="-7" y2="-13" x2="-3"/>
-        <circle x="-8.5" y="-18.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
-        <input x="-2" y="-14.5" size="5" rotate="true" text="/"/>
-    </description>
-</definition>
+<definition width="30" version="0.3" hotspot_x="15" hotspot_y="30" height="30" type="element" orientation="dyyy">
+    <names>
+        <name lang="en">Reference light (horizontal)</name>
+        <name lang="fr">Refence voyant h</name>
+        <name lang="pl">Odsyłacz - lampka sygnalizacyjna (poziomo)</name>
+    </names>
+    <informations></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="-13" x1="-7" y2="-17" x2="-3"/>
+        <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="-17" x1="-7" y2="-13" x2="-3"/>
+        <circle x="-8.5" y="-18.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <input x="-2" y="-14.5" size="5" rotate="true" text="/"/>
+    </description>
+</definition>
diff --git a/elements/references/ref_lig_ver.elmt b/elements/references/ref_voyant_2_v.elmt
similarity index 94%
rename from elements/references/ref_lig_ver.elmt
rename to elements/references/ref_voyant_2_v.elmt
index 03ad1d279..3f73f641f 100644
--- a/elements/references/ref_lig_ver.elmt
+++ b/elements/references/ref_voyant_2_v.elmt
@@ -1,13 +1,14 @@
-<definition width="20" version="0.3" hotspot_x="15" hotspot_y="20" height="20" type="element" orientation="dyyy">
-    <names>
-        <name lang="en">Reference light (vertical)</name>
-        <name lang="pl">Odsyłacz - lampka sygnalizacyjna (pionowo)</name>
-    </names>
-    <informations></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="-13" x1="-7" y2="-17" x2="-3"/>
-        <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="-17" x1="-7" y2="-13" x2="-3"/>
-        <circle x="-8.5" y="-18.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
-        <input x="-14" y="-7.5" size="5" rotate="true" text="/"/>
-    </description>
-</definition>
+<definition width="20" version="0.3" hotspot_x="15" hotspot_y="20" height="20" type="element" orientation="dyyy">
+    <names>
+        <name lang="en">Reference light (vertical)</name>
+        <name lang="fr">Reference voyant v</name>
+        <name lang="pl">Odsyłacz - lampka sygnalizacyjna (pionowo)</name>
+    </names>
+    <informations></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="-13" x1="-7" y2="-17" x2="-3"/>
+        <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="-17" x1="-7" y2="-13" x2="-3"/>
+        <circle x="-8.5" y="-18.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <input x="-14" y="-7.5" size="5" rotate="true" text="/"/>
+    </description>
+</definition>
diff --git a/elements/references/odnosnik_3_h.elmt b/elements/references/ref_voyant_h.elmt
similarity index 78%
rename from elements/references/odnosnik_3_h.elmt
rename to elements/references/ref_voyant_h.elmt
index 8b3449e16..f5121062c 100644
--- a/elements/references/odnosnik_3_h.elmt
+++ b/elements/references/ref_voyant_h.elmt
@@ -1,12 +1,14 @@
-<definition width="30" version="0.22" hotspot_x="15" hotspot_y="30" height="30" type="element" orientation="dyyy">
-    <names>
-        <name lang="pl">Odsyłacz_3 (poziomo)</name>
-    </names>
-    <informations></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="-13" x1="-7" y2="-17" x2="-3"/>
-        <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="-17" x1="-7" y2="-13" x2="-3"/>
-        <circle x="-8.5" y="-18.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
-        <input x="-2" y="-14.5" size="5" rotate="true" text="_"/>
-    </description>
-</definition>
+<definition width="30" version="0.3" hotspot_x="15" hotspot_y="30" height="30" type="element" orientation="dyyy">
+    <names>
+        <name lang="en">Reference light</name>
+        <name lang="fr">Reference voyant </name>
+        <name lang="pl">Odsyłacz_3 (poziomo)</name>
+    </names>
+    <informations></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="-13" x1="-7" y2="-17" x2="-3"/>
+        <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="-17" x1="-7" y2="-13" x2="-3"/>
+        <circle x="-8.5" y="-18.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <input x="-2" y="-14.5" size="5" rotate="true" text="_"/>
+    </description>
+</definition>
diff --git a/elements/references/odnosnik_3_v.elmt b/elements/references/ref_voyant_v.elmt
similarity index 78%
rename from elements/references/odnosnik_3_v.elmt
rename to elements/references/ref_voyant_v.elmt
index 806c99b20..9d365856f 100644
--- a/elements/references/odnosnik_3_v.elmt
+++ b/elements/references/ref_voyant_v.elmt
@@ -1,12 +1,14 @@
-<definition width="20" version="0.22" hotspot_x="15" hotspot_y="20" height="20" type="element" orientation="dyyy">
-    <names>
-        <name lang="pl">Odsyłacz_3 (pionowo)</name>
-    </names>
-    <informations></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="-13" x1="-7" y2="-17" x2="-3"/>
-        <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="-17" x1="-7" y2="-13" x2="-3"/>
-        <circle x="-8.5" y="-18.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
-        <input x="-14" y="-7.5" size="5" rotate="true" text="_"/>
-    </description>
-</definition>
+<definition width="20" version="0.3" hotspot_x="15" hotspot_y="20" height="20" type="element" orientation="dyyy">
+    <names>
+        <name lang="en">reference light</name>
+        <name lang="fr">Reference voyant</name>
+        <name lang="pl">Odsyłacz_3 (pionowo)</name>
+    </names>
+    <informations></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="-13" x1="-7" y2="-17" x2="-3"/>
+        <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="-17" x1="-7" y2="-13" x2="-3"/>
+        <circle x="-8.5" y="-18.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
+        <input x="-14" y="-7.5" size="5" rotate="true" text="_"/>
+    </description>
+</definition>