diff --git a/elements/10_electric/10_allpole/391_consumers&actuators/50_heatings/qet_directory b/elements/10_electric/10_allpole/391_consumers&actuators/50_heatings/qet_directory
index 699edc382..4f4d9c3c5 100644
--- a/elements/10_electric/10_allpole/391_consumers&actuators/50_heatings/qet_directory
+++ b/elements/10_electric/10_allpole/391_consumers&actuators/50_heatings/qet_directory
@@ -5,7 +5,7 @@
         <name lang="it">iscaldamento</name>
         <name lang="pl">Ogrzewanie</name>
         <name lang="de">Heizungen</name>
-        <name lang="fr">Verwarming</name>
+        <name lang="nl">Verwarming</name>
         <name lang="el">Θερμαντήρες</name>
     </names>
 </qet-directory>
diff --git a/elements/10_electric/10_allpole/392_generators&sources/30_batteries/qet_directory b/elements/10_electric/10_allpole/392_generators&sources/30_batteries/qet_directory
index 12e854abd..84e7c3ffb 100644
--- a/elements/10_electric/10_allpole/392_generators&sources/30_batteries/qet_directory
+++ b/elements/10_electric/10_allpole/392_generators&sources/30_batteries/qet_directory
@@ -5,7 +5,7 @@
         <name lang="it">Batterie</name>
         <name lang="pl">Ogniwa i baterie</name>
         <name lang="de">Batterien</name>
-        <name lang="fr">Batterijen</name>
+        <name lang="nl">Batterijen</name>
         <name lang="el">Μπαταρίες</name>
     </names>
 </qet-directory>
diff --git a/elements/10_electric/20_manufacturers_articles/april/qet_directory b/elements/10_electric/20_manufacturers_articles/april/qet_directory
index 9803fee91..f2c1fa91c 100644
--- a/elements/10_electric/20_manufacturers_articles/april/qet_directory
+++ b/elements/10_electric/20_manufacturers_articles/april/qet_directory
@@ -1,6 +1,5 @@
 <qet-directory>
     <names>
         <name lang="en">April</name>
-        <name lang="pl">APRIL</name>
-    </names>
+   </names>
 </qet-directory>
diff --git a/elements/10_electric/20_manufacturers_articles/parker/qet_directory b/elements/10_electric/20_manufacturers_articles/parker/qet_directory
index 6d95bc84e..895f7c5b7 100644
--- a/elements/10_electric/20_manufacturers_articles/parker/qet_directory
+++ b/elements/10_electric/20_manufacturers_articles/parker/qet_directory
@@ -1,6 +1,5 @@
 <qet-directory>
     <names>
-        <name lang="en">PARKER</name>
-        <name lang="pl">Parker</name>
-    </names>
+        <name lang="en">Parker</name>
+   </names>
 </qet-directory>
diff --git a/elements/10_electric/20_manufacturers_articles/preventa/09_safety_modules/qet_directory b/elements/10_electric/20_manufacturers_articles/schneider_electric/preventa/09_safety_modules/qet_directory
similarity index 100%
rename from elements/10_electric/20_manufacturers_articles/preventa/09_safety_modules/qet_directory
rename to elements/10_electric/20_manufacturers_articles/schneider_electric/preventa/09_safety_modules/qet_directory
diff --git a/elements/10_electric/20_manufacturers_articles/preventa/09_safety_modules/xps-al.elmt b/elements/10_electric/20_manufacturers_articles/schneider_electric/preventa/09_safety_modules/xps-al.elmt
similarity index 100%
rename from elements/10_electric/20_manufacturers_articles/preventa/09_safety_modules/xps-al.elmt
rename to elements/10_electric/20_manufacturers_articles/schneider_electric/preventa/09_safety_modules/xps-al.elmt
diff --git a/elements/10_electric/20_manufacturers_articles/preventa/09_safety_modules/xps-am.elmt b/elements/10_electric/20_manufacturers_articles/schneider_electric/preventa/09_safety_modules/xps-am.elmt
similarity index 100%
rename from elements/10_electric/20_manufacturers_articles/preventa/09_safety_modules/xps-am.elmt
rename to elements/10_electric/20_manufacturers_articles/schneider_electric/preventa/09_safety_modules/xps-am.elmt
diff --git a/elements/10_electric/20_manufacturers_articles/preventa/09_safety_modules/xps-at.elmt b/elements/10_electric/20_manufacturers_articles/schneider_electric/preventa/09_safety_modules/xps-at.elmt
similarity index 100%
rename from elements/10_electric/20_manufacturers_articles/preventa/09_safety_modules/xps-at.elmt
rename to elements/10_electric/20_manufacturers_articles/schneider_electric/preventa/09_safety_modules/xps-at.elmt
diff --git a/elements/10_electric/20_manufacturers_articles/preventa/09_safety_modules/xps_ac.elmt b/elements/10_electric/20_manufacturers_articles/schneider_electric/preventa/09_safety_modules/xps_ac.elmt
similarity index 100%
rename from elements/10_electric/20_manufacturers_articles/preventa/09_safety_modules/xps_ac.elmt
rename to elements/10_electric/20_manufacturers_articles/schneider_electric/preventa/09_safety_modules/xps_ac.elmt
diff --git a/elements/10_electric/20_manufacturers_articles/preventa/09_safety_modules/xps_af.elmt b/elements/10_electric/20_manufacturers_articles/schneider_electric/preventa/09_safety_modules/xps_af.elmt
similarity index 100%
rename from elements/10_electric/20_manufacturers_articles/preventa/09_safety_modules/xps_af.elmt
rename to elements/10_electric/20_manufacturers_articles/schneider_electric/preventa/09_safety_modules/xps_af.elmt
diff --git a/elements/10_electric/20_manufacturers_articles/preventa/09_safety_modules/xps_afl.elmt b/elements/10_electric/20_manufacturers_articles/schneider_electric/preventa/09_safety_modules/xps_afl.elmt
similarity index 100%
rename from elements/10_electric/20_manufacturers_articles/preventa/09_safety_modules/xps_afl.elmt
rename to elements/10_electric/20_manufacturers_articles/schneider_electric/preventa/09_safety_modules/xps_afl.elmt
diff --git a/elements/10_electric/20_manufacturers_articles/preventa/09_safety_modules/xps_ak.elmt b/elements/10_electric/20_manufacturers_articles/schneider_electric/preventa/09_safety_modules/xps_ak.elmt
similarity index 100%
rename from elements/10_electric/20_manufacturers_articles/preventa/09_safety_modules/xps_ak.elmt
rename to elements/10_electric/20_manufacturers_articles/schneider_electric/preventa/09_safety_modules/xps_ak.elmt
diff --git a/elements/10_electric/20_manufacturers_articles/preventa/09_safety_modules/xps_al.elmt b/elements/10_electric/20_manufacturers_articles/schneider_electric/preventa/09_safety_modules/xps_al.elmt
similarity index 100%
rename from elements/10_electric/20_manufacturers_articles/preventa/09_safety_modules/xps_al.elmt
rename to elements/10_electric/20_manufacturers_articles/schneider_electric/preventa/09_safety_modules/xps_al.elmt
diff --git a/elements/10_electric/20_manufacturers_articles/preventa/09_safety_modules/xps_asf.elmt b/elements/10_electric/20_manufacturers_articles/schneider_electric/preventa/09_safety_modules/xps_asf.elmt
similarity index 100%
rename from elements/10_electric/20_manufacturers_articles/preventa/09_safety_modules/xps_asf.elmt
rename to elements/10_electric/20_manufacturers_articles/schneider_electric/preventa/09_safety_modules/xps_asf.elmt
diff --git a/elements/10_electric/20_manufacturers_articles/preventa/09_safety_modules/xps_ba.elmt b/elements/10_electric/20_manufacturers_articles/schneider_electric/preventa/09_safety_modules/xps_ba.elmt
similarity index 100%
rename from elements/10_electric/20_manufacturers_articles/preventa/09_safety_modules/xps_ba.elmt
rename to elements/10_electric/20_manufacturers_articles/schneider_electric/preventa/09_safety_modules/xps_ba.elmt
diff --git a/elements/10_electric/20_manufacturers_articles/preventa/09_safety_modules/xps_bc.elmt b/elements/10_electric/20_manufacturers_articles/schneider_electric/preventa/09_safety_modules/xps_bc.elmt
similarity index 100%
rename from elements/10_electric/20_manufacturers_articles/preventa/09_safety_modules/xps_bc.elmt
rename to elements/10_electric/20_manufacturers_articles/schneider_electric/preventa/09_safety_modules/xps_bc.elmt
diff --git a/elements/10_electric/20_manufacturers_articles/preventa/09_safety_modules/xps_bf.elmt b/elements/10_electric/20_manufacturers_articles/schneider_electric/preventa/09_safety_modules/xps_bf.elmt
similarity index 100%
rename from elements/10_electric/20_manufacturers_articles/preventa/09_safety_modules/xps_bf.elmt
rename to elements/10_electric/20_manufacturers_articles/schneider_electric/preventa/09_safety_modules/xps_bf.elmt
diff --git a/elements/10_electric/20_manufacturers_articles/preventa/09_safety_modules/xps_dmb.elmt b/elements/10_electric/20_manufacturers_articles/schneider_electric/preventa/09_safety_modules/xps_dmb.elmt
similarity index 100%
rename from elements/10_electric/20_manufacturers_articles/preventa/09_safety_modules/xps_dmb.elmt
rename to elements/10_electric/20_manufacturers_articles/schneider_electric/preventa/09_safety_modules/xps_dmb.elmt
diff --git a/elements/10_electric/20_manufacturers_articles/preventa/09_safety_modules/xps_gske.elmt b/elements/10_electric/20_manufacturers_articles/schneider_electric/preventa/09_safety_modules/xps_gske.elmt
similarity index 100%
rename from elements/10_electric/20_manufacturers_articles/preventa/09_safety_modules/xps_gske.elmt
rename to elements/10_electric/20_manufacturers_articles/schneider_electric/preventa/09_safety_modules/xps_gske.elmt
diff --git a/elements/10_electric/20_manufacturers_articles/preventa/qet_directory b/elements/10_electric/20_manufacturers_articles/schneider_electric/preventa/qet_directory
similarity index 100%
rename from elements/10_electric/20_manufacturers_articles/preventa/qet_directory
rename to elements/10_electric/20_manufacturers_articles/schneider_electric/preventa/qet_directory
diff --git a/elements/10_electric/20_manufacturers_articles/telemecanique/test/qet_directory b/elements/10_electric/20_manufacturers_articles/telemecanique/test/qet_directory
deleted file mode 100644
index c413e25b3..000000000
--- a/elements/10_electric/20_manufacturers_articles/telemecanique/test/qet_directory
+++ /dev/null
@@ -1,5 +0,0 @@
-<qet-directory>
-    <names>
-        <name lang="de">test</name>
-    </names>
-</qet-directory>